Fix compile

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@651 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/_compile.php b/_compile.php
index cc2bdf96e21a22aa612d9feaad9cab233def9941..e9b93716b880899430bab933b1def82c734eb252 100644 (file)
--- a/_compile.php
+++ b/_compile.php
@@ -176,8 +176,8 @@ if ($_COOKIE["lang"]) {
        $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 }
 $replace = 'preg_replace("~\\\\\\\\?.*~", "", $_SERVER["REQUEST_URI"]) . "?file=\\0&version=' . $VERSION;
-$file = preg_replace('~default\\.css|functions\\.js|favicon\\.ico|(up|down|plus|cross)\\.gif~', '<?php echo ' . $replace . '"; ?>', $file);
-$file = preg_replace('~arrow\\.gif~', '" . ' . $replace, $file);
+$file = preg_replace('~default\\.css|functions\\.js|favicon\\.ico|(plus|cross)\\.gif~', '<?php echo ' . $replace . '"; ?>', $file);
+$file = preg_replace('~(up|down|arrow)\\.gif~', '" . ' . $replace, $file);
 $file = str_replace('error_reporting(E_ALL & ~E_NOTICE);', 'error_reporting(E_ALL & ~E_NOTICE);
 if (isset($_GET["file"])) {
        header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");

diff --git a/changes.txt b/changes.txt
index 3156526b474d234428b7cb9079bb92378b468f0d..067e80129080c815d499d54b98ded7edf40cb0b8 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -7,6 +7,7 @@ Version checker
 Separate JavaScript functions
 Always use the default style before the external one
 Always try to use the syntax highlighter
+Fix FOUND_ROWS() in SQL command
 Simplify order in select
 
 phpMinAdmin 1.10.1:

diff --git a/include/editing.inc.php b/include/editing.inc.php
index 7337e5fdf20eb3e4b0b9bb1fc49e4611d5db0a40..f5722685492f702be7e807fc743cd2f8c8077b13 100644 (file)
--- a/include/editing.inc.php
+++ b/include/editing.inc.php
@@ -154,8 +154,10 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0) {
 <td class="nowrap">
 <input type="image" name="add[<?php echo $i; ?>]" src="plus.gif" alt="+" title="<?php echo lang('Add next'); ?>" onclick="return !editing_add_row(this, <?php echo $allowed; ?>);" />
 <input type="image" name="drop_col[<?php echo $i; ?>]" src="cross.gif" alt="x" title="<?php echo lang('Remove'); ?>" onclick="return !editing_remove_row(this);" />
-<input type="image" name="up[<?php echo $i; ?>]" src="up.gif" alt="^" title="<?php echo lang('Move up'); ?>" />
-<input type="image" name="down[<?php echo $i; ?>]" src="down.gif" alt="v" title="<?php echo lang('Move down'); ?>" />
+<?php
+echo "<input type='image' name='up[$i]' src='up.gif' alt='^' title='" . lang('Move up') . " />\n";
+echo "<input type='image' name='down[$i]' src='down.gif' alt='v' title='" . lang('Move down') . " />\n";
+?>
 </td>
 </tr>
 <?php

diff --git a/select.inc.php b/select.inc.php
index 017c7aa3004e6d779de157fc7f6e384f60fd4253..3fbdb44a95611d5b9c698ef97e125604ae9dec06 100644 (file)
--- a/select.inc.php
+++ b/select.inc.php
@@ -235,9 +235,10 @@ if (!$columns) {
                                                        $pos2 = max(array_keys($_GET["order"]));
                                                        $pos2 += ($pos2 !== $pos ? 1 : 0);
                                                }
-                                               echo '<th onmouseover="popup(this);" onmouseout="popdown(this);"><a href="' . htmlspecialchars(remove_from_uri('(order|desc)[^=]*') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"][0] === $key && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . htmlspecialchars($key) . '</a>';
-                                               echo '<span class="hidden"><a href="' . htmlspecialchars("$uri&order%5B$pos2%5D=" . urlencode($key)) . '"><img src="up.gif" alt="^" title="' . lang('ASC') . '" /></a>';
-                                               echo '<a href="' . htmlspecialchars("$uri&order%5B$pos2%5D=" . urlencode($key) . "&desc%5B$pos2") . '%5D=1"><img src="down.gif" alt="v" title="' . lang('DESC') . '" /></a></span></th>';
+                                               echo '<th onmouseover="popup(this);" onmouseout="popdown(this);"><a href="' . htmlspecialchars(remove_from_uri('(order|desc)[^=]*') . '&order%5B0%5D=' . urlencode($key) . ($_GET["order"][0] === $key && !$_GET["desc"][0] ? '&desc%5B0%5D=1' : '')) . '">' . htmlspecialchars($key) . '</a><span class="hidden">';
+                                               echo '<a href="' . htmlspecialchars("$uri&order%5B$pos2%5D=" . urlencode($key)) . "\"><img src='up.gif' alt='^' title='" . lang('ASC') . "' /></a>";
+                                               echo '<a href="' . htmlspecialchars("$uri&order%5B$pos2%5D=" . urlencode($key) . "&desc%5B$pos2%5D=1") . "\"><img src='down.gif' alt='v' title='" . lang('DESC') . "' /></a>";
+                                               echo '</span></th>';
                                        }
                                        echo "</tr></thead>\n";
                                }

diff --git a/user.inc.php b/user.inc.php
index b7dc681cf602fe295216b42839e8e26f6118e350..75be75231caa47256d4d11c67645b8b9c4513938 100644 (file)
--- a/user.inc.php
+++ b/user.inc.php
@@ -162,7 +162,7 @@ foreach (array(
                        $name = '"grants[' . $i . '][' . htmlspecialchars(strtoupper($privilege)) . ']"';
                        $value = $grant[strtoupper($privilege)];
                        if ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : "")) {
-                               echo "<td>&nbsp;</td>";
+                               echo "<td></td>";
                        } elseif (isset($_GET["grant"])) {
                                echo "<td><select name=$name><option></option><option value='1'" . ($value ? " selected='selected'" : "") . ">" . lang('Grant') . "</option><option value='0'" . ($value == "0" ? " selected='selected'" : "") . ">" . lang('Revoke') . "</option></select></td>";
                        } else {