patch #2541261, improvement to patch #2506831

This commit is contained in:
Marc Delisle
2009-02-01 12:26:33 +00:00
parent 0c023bee7c
commit 3755869d83
2 changed files with 9 additions and 10 deletions

View File

@@ -22,7 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ patch #2494192 [display] Possibility of disabling the sliders,
thanks to Virsacer - virsacer
+ patch #2506831 [privileges] Create user for existing database,
thanks to Herman van Rink - helmo
thanks to Herman van Rink and Virsacer
+ patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer
3.1.3.0 (not yet released)

View File

@@ -2137,15 +2137,6 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
}
$odd_row = ! $odd_row;
}
// Offer to create a new user for the current database
echo '<tr><td colspan="6">';
echo ' <fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . $checkprivs .'">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . $GLOBALS['strAddUser'] . '</a>' . "\n"
. ' </fieldset>' . "\n";
echo '</td></tr>';
} else {
echo ' <tr class="odd">' . "\n"
. ' <td colspan="6">' . "\n"
@@ -2155,6 +2146,14 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
}
echo '</tbody>' . "\n"
. '</table>' . "\n";
// Offer to create a new user for the current database
echo '<fieldset id="fieldset_add_user">' . "\n"
. ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . $checkprivs .'">' . "\n"
. PMA_getIcon('b_usradd.png')
. ' ' . $GLOBALS['strAddUser'] . '</a>' . "\n"
. '</fieldset>' . "\n";
} // end if (empty($_REQUEST['adduser']) && empty($checkprivs)) ... elseif ... else ...