From 47b5a2b2f4b8ed659c3bed3a206534957b78b60d Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 15 Sep 2011 23:00:02 +0530 Subject: [PATCH 1/4] bug #3410077 - User overview erroneously loaded into Ajax dialog --- js/server_privileges.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index 738d64b821..d1d051d7db 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -364,7 +364,8 @@ $(document).ready(function() { var button_options = {}; button_options[PMA_messages['strCancel']] = function() {$(this).dialog("close").remove();} - $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true}, function(data) { + var token = $(this).parents('form').find('input[name="token"]').val(); + $.get($(this).attr('href'), {'ajax_request':true, 'edit_user_dialog': true, 'token': token}, function(data) { $('
') .append(data) .dialog({ From 65fff4483e5812f70b4ee7204ce3117287e83eb9 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 15 Sep 2011 14:09:44 +0530 Subject: [PATCH 2/4] No need to force text here --- libraries/tbl_select.lib.php | 2 +- tbl_change.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php index b200e45d53..848eb288f5 100644 --- a/libraries/tbl_select.lib.php +++ b/libraries/tbl_select.lib.php @@ -202,7 +202,7 @@ EOT; if ($in_fbs) { $edit_url = 'gis_data_editor.php?' . PMA_generate_common_url(); - $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true); + $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert')); $str .= ''; $str .= PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank'); $str .= ''; diff --git a/tbl_change.php b/tbl_change.php index 2fd9394605..7bc076747e 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -990,7 +990,7 @@ foreach ($rows as $row_id => $vrow) { $_url_params = $_url_params + array('gis_data[gis_type]' => strtoupper($field['pma_type'])); } $edit_url = 'gis_data_editor.php' . PMA_generate_common_url($_url_params); - $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert'), true); + $edit_str = PMA_getIcon('b_edit.png', __('Edit/Insert')); echo(''); echo(PMA_linkOrButton($edit_url, $edit_str, array(), false, false, '_blank')); echo(''); From 464a4159314e9de3fc8d43ba33b4869d9e657a92 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 15 Sep 2011 14:04:49 +0530 Subject: [PATCH 3/4] Use PMA_getIcon() --- db_operations.php | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/db_operations.php b/db_operations.php index 77c2af7632..6c7df590f3 100644 --- a/db_operations.php +++ b/db_operations.php @@ -395,10 +395,7 @@ if ($db != 'mysql') {
'; - } - echo __('Rename database to') . ':'; + echo PMA_getIcon('b_edit.png', __('Rename database to'), true) . ':'; ?> @@ -421,10 +418,7 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase'])
'; -} -echo __('Remove database'); +echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); ?>
    @@ -467,10 +461,7 @@ echo __('Remove database');
    '; - } - echo __('Copy database to') . ':'; + echo PMA_getIcon('b_edit.png', __('Copy database to'), true) . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; ?> @@ -531,10 +522,7 @@ echo __('Remove database'); . PMA_generate_common_hidden_inputs($db, $table) . '
    ' . "\n" . ' '; - if ($cfg['PropertiesIconic']) { - echo ''; - } - echo ' ' . "\n" + echo PMA_getIcon('s_asci.png', __('Collation'), true) . ':' . ' ' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3) From a8a63246efe931924c5cd91b93bae0c6bbcc18e3 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Thu, 15 Sep 2011 23:37:21 +0530 Subject: [PATCH 4/4] Revert changes made by 464a4159314e9de3fc8d43ba33b4869d9e657a92 and a similar instance. --- db_operations.php | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/db_operations.php b/db_operations.php index 6c7df590f3..512c894c9f 100644 --- a/db_operations.php +++ b/db_operations.php @@ -357,7 +357,12 @@ if (!$is_information_schema) {
    - + '; + } + echo __('Database comment: '); + ?> '; + } + echo __('Rename database to') . ':'; ?> @@ -418,7 +426,10 @@ if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase'])
    '; +} +echo __('Remove database'); ?>
      @@ -461,7 +472,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true);
      '; + } + echo __('Copy database to') . ':'; $drop_clause = 'DROP TABLE / DROP VIEW'; ?> @@ -522,7 +536,10 @@ echo PMA_getIcon('b_deltbl.png', __('Remove database'), true); . PMA_generate_common_hidden_inputs($db, $table) . '
      ' . "\n" . ' '; - echo PMA_getIcon('s_asci.png', __('Collation'), true) . ':' + if ($cfg['PropertiesIconic']) { + echo ''; + } + echo ' ' . "\n" . ' ' . "\n" . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, false, 3)