From 0c2f7f16f52cd0e37687fac063ad36678657b070 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sun, 25 Sep 2011 17:25:52 +0200 Subject: [PATCH 1/3] Remove javascript: from pmd links --- pmd_general.php | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 6da6b2e7a5..41fcb79889 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -69,46 +69,46 @@ echo $script_tabs . $script_contr . $script_display_field;
- + v - vkeykey'; }?> - + >
@@ -132,12 +132,12 @@ echo $script_tabs . $script_contr . $script_display_field;
- + v - + v
From 29a41fc9916fae27d222c970b697474dcb1ce116 Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sun, 25 Sep 2011 17:26:21 +0200 Subject: [PATCH 2/3] "javascript:" is not needed here --- libraries/navigation_header.inc.php | 2 +- querywindow.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index fa5255a569..b549a02fd8 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -87,7 +87,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { } echo '' . $query_frame_link_text . '' . "\n"; } // end if ($server != 0) diff --git a/querywindow.php b/querywindow.php index 0b92ad893b..dfbe931daf 100644 --- a/querywindow.php +++ b/querywindow.php @@ -87,23 +87,23 @@ if ($no_js) { $tabs['sql']['icon'] = 'b_sql.png'; $tabs['sql']['text'] = __('SQL'); $tabs['sql']['fragment'] = '#'; - $tabs['sql']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"'; + $tabs['sql']['attr'] = 'onclick="PMA_querywindowCommit(\'sql\');return false;"'; $tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql'); $tabs['import']['icon'] = 'b_import.png'; $tabs['import']['text'] = __('Import files'); $tabs['import']['fragment'] = '#'; - $tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"'; + $tabs['import']['attr'] = 'onclick="PMA_querywindowCommit(\'files\');return false;"'; $tabs['import']['active'] = (bool) ($querydisplay_tab == 'files'); $tabs['history']['icon'] = 'b_bookmark.png'; $tabs['history']['text'] = __('SQL history'); $tabs['history']['fragment'] = '#'; - $tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"'; + $tabs['history']['attr'] = 'onclick="PMA_querywindowCommit(\'history\');return false;"'; $tabs['history']['active'] = (bool) ($querydisplay_tab == 'history'); if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') { $tabs['all']['text'] = __('All'); $tabs['all']['fragment'] = '#'; - $tabs['all']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'full\');return false;"'; + $tabs['all']['attr'] = 'onclick="PMA_querywindowCommit(\'full\');return false;"'; $tabs['all']['active'] = (bool) ($querydisplay_tab == 'full'); } } From 66adfdef30f0a3c802c7bf268e97d7faf49f223e Mon Sep 17 00:00:00 2001 From: Piotr Przybylski Date: Sun, 25 Sep 2011 17:47:06 +0200 Subject: [PATCH 3/3] Forgot changelog entry for bug #3324161 --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c7a633c201..cc46481b18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #3411224 [display] Broken binary column when 'Show binary contents' is not set - bug #3411633 [core] Call to undefined function PMA_isSuperuser() - bug #3413743 [interface] Display options link missing after search +- bug #3324161 [core] CSP policy causing designer JS buttons to fail 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd