Git September 2011

git@phpmyadmin.net

7 participants
167 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19912-gcecf7f9

by Madhura Jayaratne

The branch, master has been updated via cecf7f9fea2964522cc9a4ab1ba85b4beee91a2b (commit) from a429734b636319de97c1ee109d8064881b59dc1e (commit) - Log ----------------------------------------------------------------- commit cecf7f9fea2964522cc9a4ab1ba85b4beee91a2b Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Sep 25 22:21:57 2011 +0530 typo ----------------------------------------------------------------------- Summary of changes: js/sql.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index c6f2f0c..d729677 100644 --- a/js/sql.js +++ b/js/sql.js @@ -190,7 +190,7 @@ $(document).ready(function() { $("#id_bookmark option[value='" + data.id_bookmark + "']").remove(); } $('#sqlqueryform').before(data.message); - } elseif (typeof data.sql_query != 'undefined') { + } else if (typeof data.sql_query != 'undefined') { $('<div class="sqlquery_message"></div>') .html(data.sql_query) .insertBefore('#sqlqueryform'); hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19911-ga429734

by Piotr Przybylski

The branch, master has been updated via a429734b636319de97c1ee109d8064881b59dc1e (commit) via 66adfdef30f0a3c802c7bf268e97d7faf49f223e (commit) from 55d72e8c71e967d0bcba9069f2402a88882ee4c5 (commit) - Log ----------------------------------------------------------------- commit a429734b636319de97c1ee109d8064881b59dc1e Merge: 55d72e8 66adfde Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Sep 25 17:47:20 2011 +0200 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4805ea2..e9971da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,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 hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-25-g66adfde

by Piotr Przybylski

The branch, QA_3_4 has been updated via 66adfdef30f0a3c802c7bf268e97d7faf49f223e (commit) from 29a41fc9916fae27d222c970b697474dcb1ce116 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7a633c..cc46481 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 hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19909-g55d72e8

by Piotr Przybylski

The branch, master has been updated via 55d72e8c71e967d0bcba9069f2402a88882ee4c5 (commit) via 29a41fc9916fae27d222c970b697474dcb1ce116 (commit) via 0c2f7f16f52cd0e37687fac063ad36678657b070 (commit) from 1c48e6a817746e4f37f1ec685850abdcbdf7b7ff (commit) - Log ----------------------------------------------------------------- commit 55d72e8c71e967d0bcba9069f2402a88882ee4c5 Merge: 1c48e6a 29a41fc Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Sep 25 17:35:07 2011 +0200 Merge branch 'QA_3_4' Conflicts: pmd_general.php ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 2 +- pmd_general.php | 38 +++++++++++++++++----------------- querywindow.php | 8 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 7f7c530..ede5ef8 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -84,7 +84,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { } echo '<a href="' . $anchor . '&no_js=true"' .' title="' . __('Query window') . '"'; - echo ' onclick="javascript:if (window.parent.open_querywindow()) return false;"'; + echo ' onclick="if (window.parent.open_querywindow()) return false;"'; echo '>' . $query_frame_link_text . '</a>' . "\n"; } // end if ($server != 0) diff --git a/pmd_general.php b/pmd_general.php index 3f59a4c..b455281 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -59,46 +59,46 @@ echo $script_tabs . $script_contr . $script_display_field; <body onload="Main()" class="general_body" id="pmd_body"> <div class="pmd_header" id="top_menu"> - <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));" - onmousedown="return false;" class="M_butt first" target="_self"> + <a href="#" + onclick="Show_left_menu(document.getElementById('key_Show_left_menu')); return false" class="M_butt first" target="_self"> <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a> - <a href="javascript:Save2();" onmousedown="return false;" + <a href="#" onclick="Save2(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Save position') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt="" - /></a><a href="javascript:Start_table_new();" onmousedown="return false;" + /></a><a href="#" onclick="Start_table_new(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt="" - /></a><a href="javascript:Start_relation();" onmousedown="return false;" + /></a><a href="#" onclick="Start_relation(); return false" class="M_butt" id="rel_button" target="_self" ><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt="" - /></a><a href="javascript:Start_display_field();" onmousedown="return false;" + /></a><a href="#" onclick="Start_display_field(); return false" class="M_butt" id="display_field_button" target="_self" ><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt="" - /></a><a href="javascript:location.reload();" onmousedown="return false;" + /></a><a href="#" onclick="location.reload(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt="" /></a><a href="Documentation.html#faq6_31" target="documentation" class="M_butt" target="_self" ><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt="" /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" - /><a href="javascript:Angular_direct();" onmousedown="return false;" + /><a href="#" onclick="Angular_direct(); return false" class="M_butt" id="angular_direct_button" target="_self" ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt="" - /></a><a href="javascript:Grid();" onmousedown="return false;" + /></a><a href="#" onclick="Grid(); return false" class="M_butt" id="grid_button" target="_self" ><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt="" /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" - /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" - onmousedown="return false;" class="M_butt" target="_self" + /><a href="#" + onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" - /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;" + /></a><a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png" /></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt="" - /><a href="javascript:PDF_save();" onmousedown="return false;" + /><a href="#" onclick="PDF_save(); return false" class="M_butt" target="_self" ><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a @@ -109,8 +109,8 @@ echo $script_tabs . $script_contr . $script_display_field; echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="'; echo __('Build Query'); echo '"/></a>'; }?> - <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" - onmousedown="return false;" class="M_butt last" target="_self"> + <a href="#" + onclick="Top_menu_right(document.getElementById('key_Left_Right')); return false" class="M_butt last" target="_self"> <img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo __('Move Menu'); ?>" /></a> </div> @@ -121,12 +121,12 @@ echo $script_tabs . $script_contr . $script_display_field; </div> <div id="layer_menu" style="display:none;"> <div align="center" style="padding-top:5px;"> - <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" - onmousedown="return false;" class="M_butt" target="_self"> + <a href="#" + onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show all'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a> - <a href="javascript:No_have_constr(document.getElementById('key_HS'));" - onmousedown="return false;" class="M_butt" target="_self"> + <a href="#" + onclick="No_have_constr(document.getElementById('key_HS')); return false" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a> </div> diff --git a/querywindow.php b/querywindow.php index 7a9f83d..9cffbe6 100644 --- a/querywindow.php +++ b/querywindow.php @@ -63,23 +63,23 @@ if ($no_js) { $tabs['sql']['icon'] = 'ic_b_sql'; $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'] = 'ic_b_import'; $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'] = 'ic_b_bookmark'; $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'); } } hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-24-g29a41fc

by Piotr Przybylski

The branch, QA_3_4 has been updated via 29a41fc9916fae27d222c970b697474dcb1ce116 (commit) via 0c2f7f16f52cd0e37687fac063ad36678657b070 (commit) from 1eeddcd08260b3467b6e5aa5eadd0a0a694867df (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 2 +- pmd_general.php | 40 +++++++++++++++++----------------- querywindow.php | 8 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index fa5255a..b549a02 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -87,7 +87,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { } echo '<a href="' . $anchor . '&no_js=true"' .' title="' . __('Query window') . '"'; - echo ' onclick="javascript:if (window.parent.open_querywindow()) return false;"'; + echo ' onclick="if (window.parent.open_querywindow()) return false;"'; echo '>' . $query_frame_link_text . '</a>' . "\n"; } // end if ($server != 0) diff --git a/pmd_general.php b/pmd_general.php index 6da6b2e..41fcb79 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -69,46 +69,46 @@ echo $script_tabs . $script_contr . $script_display_field; <body onload="Main()" class="general_body" id="pmd_body"> <div class="header" id="top_menu"> - <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));" - onmousedown="return false;" class="M_butt first" target="_self"> + <a href="#" onclick="Show_left_menu(document.getElementById('key_Show_left_menu')); return false" + class="M_butt first" target="_self"> <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>" alt="v" src="pmd/images/downarrow2_m.png" /></a> - <a href="javascript:Save2();" onmousedown="return false;" + <a href="#" onclick="Save2(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Save position') ?>" src="pmd/images/save.png" alt="" - /></a><a href="javascript:Start_table_new();" onmousedown="return false;" + /></a><a href="#" onclick="Start_table_new(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Create table')?>" src="pmd/images/table.png" alt="" - /></a><a href="javascript:Start_relation();" onmousedown="return false;" + /></a><a href="#" onclick="Start_relation(); return false" class="M_butt" id="rel_button" target="_self" ><img title="<?php echo __('Create relation') ?>" src="pmd/images/relation.png" alt="" - /></a><a href="javascript:Start_display_field();" onmousedown="return false;" + /></a><a href="#" onclick="Start_display_field(); return false" class="M_butt" id="display_field_button" target="_self" ><img title="<?php echo __('Choose column to display') ?>" src="pmd/images/display_field.png" alt="" - /></a><a href="javascript:location.reload();" onmousedown="return false;" + /></a><a href="#" onclick="location.reload(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" - /></a><a href="javascript:Help();" onmousedown="return false;" + /></a><a href="#" onclick="Help(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt="" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" - /><a href="javascript:Angular_direct();" onmousedown="return false;" + /><a href="#" onclick="Angular_direct(); return false" class="M_butt" id="angular_direct_button" target="_self" ><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>" src="pmd/images/ang_direct.png" alt="" - /></a><a href="javascript:Grid();" onmousedown="return false;" + /></a><a href="#" onclick="Grid(); return false" class="M_butt" id="grid_button" target="_self" ><img title="<?php echo __('Snap to grid') ?>" src="pmd/images/grid.png" alt="" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" - /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));" - onmousedown="return false;" class="M_butt" target="_self" + /><a href="#" + onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self" ><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v" src="pmd/images/downarrow1.png" - /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;" + /></a><a href="#" onclick="Small_tab_invert(); return false" class="M_butt" target="_self" ><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="pmd/images/bottom.png" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" - /><a href="javascript:PDF_save();" onmousedown="return false;" + /><a href="#" onclick="PDF_save(); return false" class="M_butt" target="_self" ><img src="pmd/images/pdf.png" alt="key" width="20" height="20" title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a @@ -119,8 +119,8 @@ echo $script_tabs . $script_contr . $script_display_field; echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="'; echo __('Build Query'); echo '"/></a>'; }?> - <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));" - onmousedown="return false;" class="M_butt last" target="_self"> + <a href="#" + onclick="Top_menu_right(document.getElementById('key_Left_Right')); return false" class="M_butt last" target="_self"> <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">" title="<?php echo __('Move Menu'); ?>" /></a> </div> @@ -132,12 +132,12 @@ echo $script_tabs . $script_contr . $script_display_field; <form action="" method="post" name="form1"> <div id="layer_menu" style="visibility:<?php echo $hidden ?>;"> <div align="center" style="padding-top:5px;"> - <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" - onmousedown="return false;" class="M_butt" target="_self"> + <a href="#" + onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show all'); ?>" alt="v" src="pmd/images/downarrow1.png" id='key_HS_all' /></a> - <a href="javascript:No_have_constr(document.getElementById('key_HS'));" - onmousedown="return false;" class="M_butt" target="_self"> + <a href="#" + onclick="No_have_constr(document.getElementById('key_HS')); return false" class="M_butt" target="_self"> <img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v" src="pmd/images/downarrow2.png" id='key_HS' /></a> </div> diff --git a/querywindow.php b/querywindow.php index 0b92ad8..dfbe931 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'); } } hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19906-g1c48e6a

by Marc Delisle

The branch, master has been updated via 1c48e6a817746e4f37f1ec685850abdcbdf7b7ff (commit) via 1eeddcd08260b3467b6e5aa5eadd0a0a694867df (commit) from 16c5e7bab03d3651b05470bd1dcdf89a8998c08d (commit) - Log ----------------------------------------------------------------- commit 1c48e6a817746e4f37f1ec685850abdcbdf7b7ff Merge: 16c5e7b 1eeddcd Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 25 07:45:59 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/tbl_select.js | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd028c7..4805ea2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog - bug #3411535 [display] Full text button unchecks results display options - 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 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/tbl_select.js b/js/tbl_select.js index 00e3a57..1808b73 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -77,6 +77,8 @@ $(document).ready(function() { $('#togglesearchformdiv') // now it's time to show the div containing the link .show(); + // needed for the display options slider in the results + PMA_init_slider(); } else { // error message (zero rows) $("#sqlqueryresults").html(response['message']); hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-22-g1eeddcd

by Marc Delisle

The branch, QA_3_4 has been updated via 1eeddcd08260b3467b6e5aa5eadd0a0a694867df (commit) from 158ce0657a8e9779348bbde43332b6a07ee37886 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + js/tbl_select.js | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e46b9df..c7a633c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #3411535 [display] Full text button unchecks results display options - 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 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/js/tbl_select.js b/js/tbl_select.js index 8115245..041d6ef 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -77,6 +77,8 @@ $(document).ready(function() { $('#togglesearchformdiv') // now it's time to show the div containing the link .show(); + // needed for the display options slider in the results + PMA_init_slider(); } else { // error message (zero rows) $("#sqlqueryresults").html(response['message']); hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19904-g16c5e7b

by Marc Delisle

The branch, master has been updated via 16c5e7bab03d3651b05470bd1dcdf89a8998c08d (commit) from 480e77e77e6a8f437ee50fa4c0603b494fe6407b (commit) - Log ----------------------------------------------------------------- commit 16c5e7bab03d3651b05470bd1dcdf89a8998c08d Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Sep 25 06:59:34 2011 -0400 Designer: broken image paths when used at the Javascript level ----------------------------------------------------------------------- Summary of changes: js/pmd/history.js | 4 ++-- js/pmd/move.js | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/pmd/history.js b/js/pmd/history.js index 3e3a195..fdc76c8 100644 --- a/js/pmd/history.js +++ b/js/pmd/history.js @@ -68,10 +68,10 @@ function display(init,finit) str +='<div class="block"> <table width ="250">'; str += '<thead><tr><td>'; if(history_array[i].get_and_or()){ - str +='<img src="pmd/images/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>'; + str +='<img src="' + pmaThemeImage + 'pmd/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>'; } else { - str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>'; + str +='<img src="' + pmaThemeImage + 'pmd/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>'; } str +='<td style="padding-left: 5px;" align="right"><img class="icon ic_b_sbrowse" src="themes/dot.gif" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name(); if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") { diff --git a/js/pmd/move.js b/js/pmd/move.js index 6c3f56e..73d7c8f 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -636,7 +636,7 @@ function Small_tab_all(id_this) // max/min all tables } } id_this.alt = ">"; - id_this.src = "pmd/images/rightarrow1.png"; + id_this.src = pmaThemeImage + "pmd/rightarrow1.png"; } else { for (key in j_tabs) { if (document.getElementById('id_hide_tbody_'+key).innerHTML != "v") { @@ -644,7 +644,7 @@ function Small_tab_all(id_this) // max/min all tables } } id_this.alt = "v"; - id_this.src = "pmd/images/downarrow1.png"; + id_this.src = pmaThemeImage + "pmd/downarrow1.png"; } Re_load(); } @@ -803,10 +803,10 @@ function Hide_tab_all(id_this) // max/min all tables { if (id_this.alt == 'v') { id_this.alt = '>'; - id_this.src = "pmd/images/rightarrow1.png"; + id_this.src = pmaThemeImage + "pmd/rightarrow1.png"; } else { id_this.alt = 'v'; - id_this.src = "pmd/images/downarrow1.png"; + id_this.src = pmaThemeImage + "pmd/downarrow1.png"; } var E = document.form1; for (i = 0; i < E.elements.length; i++) { @@ -847,10 +847,10 @@ function No_have_constr(id_this) if (id_this.alt == 'v') { id_this.alt = '>'; - id_this.src = "pmd/images/rightarrow2.png"; + id_this.src = pmaThemeImage + "pmd/rightarrow2.png"; } else { id_this.alt = 'v'; - id_this.src = "pmd/images/downarrow2.png"; + id_this.src = pmaThemeImage + "pmd/downarrow2.png"; } var E = document.form1; for (i = 0; i < E.elements.length; i++) { @@ -921,7 +921,7 @@ function Show_left_menu(id_this) // max/min all tables document.getElementById("layer_menu").style.left = pos.left + 'px'; document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; - id_this.src = "pmd/images/uparrow2_m.png"; + id_this.src = pmaThemeImage + "pmd/uparrow2_m.png"; if (isIE) { General_scroll(); } @@ -929,7 +929,7 @@ function Show_left_menu(id_this) // max/min all tables document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll document.getElementById("layer_menu").style.display = 'none'; id_this.alt = "v"; - id_this.src = "pmd/images/downarrow2_m.png"; + id_this.src = pmaThemeImage + "pmd/downarrow2_m.png"; } } //------------------------------------------------------------------------------ @@ -938,11 +938,11 @@ function Top_menu_right(id_this) if (id_this.alt == ">") { document.getElementById('top_menu').style.marginLeft = document.getElementById('top_menu').offsetWidth + 'px'; // = 350 id_this.alt = "<"; - id_this.src = "pmd/images/2leftarrow_m.png"; + id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png"; } else { document.getElementById('top_menu').style.marginLeft = 0; id_this.alt = ">"; - id_this.src = "pmd/images/2rightarrow_m.png"; + id_this.src = pmaThemeImage + "pmd/2rightarrow_m.png"; } } //------------------------------------------------------------------------------ hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19903-g480e77e

by Marc Delisle

The branch, master has been updated via 480e77e77e6a8f437ee50fa4c0603b494fe6407b (commit) via 158ce0657a8e9779348bbde43332b6a07ee37886 (commit) from efa9eeb5583d95972af3fe195e903ac843103de8 (commit) - Log ----------------------------------------------------------------- commit 480e77e77e6a8f437ee50fa4c0603b494fe6407b Merge: efa9eeb 158ce06 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Sep 24 06:18:00 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: libraries/header_scripts.inc.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index 21c5d9a..d211e48 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -20,12 +20,14 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) { } // generate title (unless we already have $page_title, from cookie auth) if (! isset($page_title)) { - $title = PMA_expandUserString( - !empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : - (!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : - (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : + if ($GLOBALS['server'] > 0) { + $title = PMA_expandUserString( + ! empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : + (! empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : + (! empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : $GLOBALS['cfg']['TitleDefault'])) ); + } } else { $title = $page_title; } @@ -57,7 +59,7 @@ foreach ($GLOBALS['js_include'] as $js_script_file) { // <![CDATA[ if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown' && typeof(parent.document.title) == 'string') { - parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>'; + parent.document.title = '<?php echo (isset($title) ? PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))) : ''); ?>'; } <?php if(count($GLOBALS['js_script']) > 0) { hooks/post-receive -- phpMyAdmin

12 years, 10 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_5-21-g158ce06

by Marc Delisle

The branch, QA_3_4 has been updated via 158ce0657a8e9779348bbde43332b6a07ee37886 (commit) from 5b2befc1716bfca6b21305a0cb5df6d965eb4c9a (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/header_scripts.inc.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index c25aa99..a65445b 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -20,12 +20,14 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) { } // generate title (unless we already have $page_title, from cookie auth) if (! isset($page_title)) { - $title = PMA_expandUserString( - !empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : - (!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : - (!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : + if ($GLOBALS['server'] > 0) { + $title = PMA_expandUserString( + ! empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] : + (! empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] : + (! empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] : $GLOBALS['cfg']['TitleDefault'])) ); + } } else { $title = $page_title; } @@ -57,7 +59,7 @@ foreach ($GLOBALS['js_include'] as $js_script_file) { // Updates the title of the frameset if possible (ns4 does not allow this) if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown' && typeof(parent.document.title) == 'string') { - parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>'; + parent.document.title = '<?php echo (isset($title) ? PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))) : ''); ?>'; } <?php hooks/post-receive -- phpMyAdmin

12 years, 10 months

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git September 2011