Browse files

Fix compile

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@651 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information...
1 parent 6563b5e commit 111cbb324d60fd00cc57f5d528ab7074b3ee747b jakubvrana committed Jun 3, 2009
Showing with 12 additions and 8 deletions.
  1. +2 −2 _compile.php
  2. +1 −0 changes.txt
  3. +4 −2 include/editing.inc.php
  4. +4 −3 select.inc.php
  5. +1 −1 user.inc.php
View
4 _compile.php
@@ -176,8 +176,8 @@ function php_shrink($input) {
$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");
View
1 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:
View
6 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
View
7 select.inc.php
@@ -235,9 +235,10 @@
$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";
}
View
2 user.inc.php
@@ -162,7 +162,7 @@ function all_privileges(&$grants, $privileges) {
$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 {

0 comments on commit 111cbb3

Please sign in to comment.