The branch, master has been updated via 1c457194fa42120e336da3138e76361342b0eeea (commit) from 7dddcd837ca561bd120eb16e089e31bed376797d (commit)

- Log ----------------------------------------------------------------- commit 1c457194fa42120e336da3138e76361342b0eeea Author: Rouslan Placella rouslan@placella.com Date: Mon Nov 28 00:55:57 2011 +0000

XHTML fixes

-----------------------------------------------------------------------

Summary of changes: js/server_privileges.js | 2 +- server_privileges.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js index 6a7e289..5d5cca8 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -201,7 +201,7 @@ $(document).ready(function() { if ($('#fieldset_add_user a.ajax').attr('name') == 'db_specific') {

/*process the fieldset_add_user attribute and get the val of privileges*/ - var url = $('#fieldset_add_user a.ajax').attr('val'); + var url = $('#fieldset_add_user a.ajax').attr('rel');

if (url.substring(url.length - 23, url.length) == "&goto=db_operations.php") { url = url.substring(0, url.length - 23); diff --git a/server_privileges.php b/server_privileges.php index dce4ce1..d653efc 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -2240,7 +2240,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '</form>' . "\n"; } else { // check the privileges for a particular database. - $user_form = '<form id="usersForm"><fieldset>' . "\n" + $user_form = '<form id="usersForm" action="server_privileges.php"><fieldset>' . "\n" . '<legend>' . "\n" . PMA_getIcon('b_usrcheck.png') . ' ' . sprintf(__('Users having access to &quot;%s&quot;'), '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($checkprivs) . '">' . htmlspecialchars($checkprivs) . '</a>') . "\n" @@ -2401,7 +2401,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs // Offer to create a new user for the current database $user_form .= '<fieldset id="fieldset_add_user">' . "\n" . '<legend>' . __('New') . '</legend>' . "\n" - . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs) .'" val="'.'checkprivs='.htmlspecialchars($checkprivs). '&'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" + . ' <a href="server_privileges.php?' . $GLOBALS['url_query'] . '&amp;adduser=1&amp;dbname=' . htmlspecialchars($checkprivs) .'" rel="'.'checkprivs='.htmlspecialchars($checkprivs). '&amp;'.$GLOBALS['url_query'] . '" class="'.$conditional_class.'" name="db_specific">' . "\n" . PMA_getIcon('b_usradd.png') . ' ' . __('Add user') . '</a>' . "\n" . '</fieldset>' . "\n";

hooks/post-receive