The branch, master has been updated via 60e08fc20c3dc216a23c38089ec51a817760184d (commit) from 7554fc35708d629ea79a791ca2e80af950573b24 (commit)

- Log ----------------------------------------------------------------- commit 60e08fc20c3dc216a23c38089ec51a817760184d Author: Madhura Jayaratne madhura.cj@gmail.com Date: Tue Apr 19 07:56:45 2011 +0530

Rows should not be marked in these tables. Added class="noclick"

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

Summary of changes: browse_foreigners.php | 6 +++--- server_privileges.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php index be68981..c8867af 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -85,7 +85,7 @@ if (is_array($foreignData['disp_row'])) { <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=right&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> <?php -// includes everything asked for by libraries/common.inc.php +// includes everything asked for by libraries/common.inc.php require_once './libraries/header_scripts.inc.php'; ?> <script type="text/javascript"> @@ -95,7 +95,7 @@ require_once './libraries/header_scripts.inc.php'; var $inline = window.opener.jQuery('.browse_foreign_clicked'); if ($inline.length != 0) { $inline.removeClass('browse_foreign_clicked') - // puts new value in the previous element which is + // puts new value in the previous element which is // a span with class curr_value .prev().text(key); self.close(); @@ -241,7 +241,7 @@ if (is_array($foreignData['disp_row'])) { }

?> - <tr class="<?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> + <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>"> <td nowrap="nowrap"> <?php echo ($key_ordered_current_equals_data ? '<strong>' : '') diff --git a/server_privileges.php b/server_privileges.php index e436143..d497d71 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1287,7 +1287,7 @@ if (isset($_REQUEST['delete']) || (isset($_REQUEST['change_copy']) && $_REQUEST[ if (isset($_REQUEST['drop_users_db'])) { $queries[] = 'DROP DATABASE IF EXISTS ' . PMA_backquote($this_user) . ';'; $GLOBALS['reload'] = TRUE; - + if($GLOBALS['is_ajax_request'] != true) { PMA_reloadNavigation(); } @@ -2127,7 +2127,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs } } } elseif (isset($_REQUEST['adduser'])) { - + // Add a new user $GLOBALS['url_query'] .= '&amp;adduser=1'; echo '<h2>' . "\n" @@ -2261,7 +2261,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs $current_privileges[] = $row; $row = PMA_DBI_fetch_assoc($res); } - echo ' <tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" + echo ' <tr class="noclick ' . ($odd_row ? 'odd' : 'even') . '">' . "\n" . ' <td'; if (count($current_privileges) > 1) { echo ' rowspan="' . count($current_privileges) . '"';

hooks/post-receive