October 2010 - Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_3_8, updated. RELEASE_3_3_8RC1-1-gcdf7677
by Marc Delisle 25 Oct '10

25 Oct '10

The branch, MAINT_3_3_8 has been updated via cdf76774d1773c5ceea8686a8c4ea1352ebc1ca5 (commit) from af98b694f4d46ce2a3e357ab6bed41065e12deab (commit) - Log ----------------------------------------------------------------- commit cdf76774d1773c5ceea8686a8c4ea1352ebc1ca5 Author: Marc Delisle <marc(a)infomarc.info> Date: Mon Oct 25 12:18:34 2010 -0400 3.3.8 release ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2385125..4827fb6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/… $ -3.3.8.0 (not yet released) +3.3.8.0 (2010-10-25) - bug #3059311 [import] BIGINT field type added to table analysis - [core] Update library PHPExcel to version 1.7.4 - bug #3062455 [core] copy procedures and routines before tables diff --git a/Documentation.html b/Documentation.html index ab7ae27..a233ccd 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8-rc1 - Documentation</title> + <title>phpMyAdmin 3.3.8 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8-rc1 + 3.3.8 Documentation </h1> </div> diff --git a/README b/README index c6c5507..967acde 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.8-rc1 - ----------------- + Version 3.3.8 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index df596ec..6594e3a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.8-rc1'); + $this->set('PMA_VERSION', '3.3.8'); /** * @deprecated */ diff --git a/translators.html b/translators.html index a292bd1..598e218 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.3.8-rc1 - Official translators</title> + <title>phpMyAdmin 3.3.8 - Official translators</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -19,7 +19,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.3.8-rc1 + 3.3.8 official translators list </h1> </div> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10700-gc0cb472
by Michal Čihař 25 Oct '10

25 Oct '10

The branch, master has been updated via c0cb47265649f33cb77cad4a73dff54ed1bd2556 (commit) from 49b6510b95e5b46dee494be9f8cf2ee86c732b79 (commit) - Log ----------------------------------------------------------------- commit c0cb47265649f33cb77cad4a73dff54ed1bd2556 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Oct 25 17:46:00 2010 +0200 Reload navigation frame after creating database (bug #3081099). ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 472eb00..9facf22 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2298,6 +2298,10 @@ $(document).ready(function() { var $databases_count_object = $('#databases_count'); var databases_count = parseInt($databases_count_object.text()); $databases_count_object.text(++databases_count); + //Refresh navigation frame as a new database has been added + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } } else { PMA_ajaxShowMessage(data.error); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. ac60daf5e17669ec2a806807f90c3579f905d6cf
by Michal Čihař 25 Oct '10

25 Oct '10

The branch, master has been updated via ac60daf5e17669ec2a806807f90c3579f905d6cf (commit) from 09478279a1fecf4791a1b03e5f446dbb3e785a52 (commit) - Log ----------------------------------------------------------------- commit ac60daf5e17669ec2a806807f90c3579f905d6cf Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Oct 25 13:12:01 2010 +0200 Add Flattr. ----------------------------------------------------------------------- Summary of changes: templates/_page.tpl | 14 ++++++++++++++ templates/donate.tpl | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/templates/_page.tpl b/templates/_page.tpl index 21ce4ec..aef3070 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -25,6 +25,19 @@ <meta http-equiv="X-Generated" content="${generated}" /> <meta name="verify-v1" content="3AM2eNj0zQ1Ao/N2eGE02S45V3p5KQxAyMIxdUJhtEQ=" /> <meta name="robots" content="index, follow" /> +<script type="text/javascript"> +/* <![CDATA[ */ + (function() { + var s = document.createElement('script'), t = document.getElementsByTagName('script')[0]; + + s.type = 'text/javascript'; + s.async = true; + s.src = 'http://api.flattr.com/js/0.5.0/load.js?mode=auto'; + + t.parentNode.insertBefore(s, t); + })(); +/* ]]> */ +</script> </head> <body> <div id="header"> @@ -46,6 +59,7 @@ <li><a href="${base_url}about-website.${file_ext}" title="Information about website">About</a></li> <li class="last">Valid <a href="http://validator.w3.org/check/referer">HTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></li> <li class="logo"><a href="http://sourceforge.net/projects/phpmyadmin"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=23067&type=10" width="80" height="15" alt="Get phpMyAdmin at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></li> + <li class="logo"><a class="FlattrButton" style="display:none;" rev="flattr;button:compact;" href="http://www.phpmyadmin.net/"></a></li> </ul> <script type="text/javascript"> var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); diff --git a/templates/donate.tpl b/templates/donate.tpl index e86a4a9..c900f34 100644 --- a/templates/donate.tpl +++ b/templates/donate.tpl @@ -8,7 +8,7 @@ <h2>Donations</h2> <p> We invite you to <a href="https://sourceforge.net/donate/index.php?group_id=23067" rel="payment">contribute money</a> to our project. Donations will be used for -the promotion of phpMyAdmin. Thanks. +the promotion of phpMyAdmin. Thanks. Alternatively you can appreciate our work using <a href="https://flattr.com/thing/56976/phpMyAdmin">Flattr</a>. </p> <h2>Recent donors</h2> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10699-g49b6510
by Marc Delisle 24 Oct '10

24 Oct '10

The branch, master has been updated via 49b6510b95e5b46dee494be9f8cf2ee86c732b79 (commit) from d3d149c3605d8b26748d02aa6e534018e9fd123a (commit) - Log ----------------------------------------------------------------- commit 49b6510b95e5b46dee494be9f8cf2ee86c732b79 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Oct 24 13:55:53 2010 -0400 jQuery-fy the auto-checking of the other checkbox ----------------------------------------------------------------------- Summary of changes: js/functions.js | 49 +++++++++++++++++++++------------------- libraries/display_tbl.lib.php | 11 +++++---- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/js/functions.js b/js/functions.js index b421d09..472eb00 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1256,29 +1256,6 @@ function setCheckboxes( container_id, state ) { return true; } // end of the 'setCheckboxes()' function - -// copy the checked from left to right or from right to left -// so it's easier for users to see, if $cfg['ModifyAtRight']=true, what they've checked ;) -function copyCheckboxesRange(the_form, the_name, the_clicked) -{ - if (typeof(document.forms[the_form].elements[the_name]) != 'undefined' && typeof(document.forms[the_form].elements[the_name + 'r']) != 'undefined') { - if (the_clicked !== 'r') { - if (document.forms[the_form].elements[the_name].checked == true) { - document.forms[the_form].elements[the_name + 'r'].checked = true; - }else { - document.forms[the_form].elements[the_name + 'r'].checked = false; - } - } else if (the_clicked == 'r') { - if (document.forms[the_form].elements[the_name + 'r'].checked == true) { - document.forms[the_form].elements[the_name].checked = true; - }else { - document.forms[the_form].elements[the_name].checked = false; - } - } - } -} - - // - this was directly written to each td, so why not a function ;) // setCheckboxColumn(\'id_rows_to_delete' . $row_no . ''\'); function setCheckboxColumn(theCheckbox){ @@ -2678,3 +2655,29 @@ $(function() { $(window).resize(menuResize); menuResize(); }); + +/** + * When there is a checkbox on both ends of the row, propagate the click on + * one of them to the other one + */ +$(document).ready(function() { + $('.verify_other_checkbox').live('click',function() { + var current_checkbox_id = this.id; + var left_checkbox_id = current_checkbox_id.replace('_right', '_left'); + var right_checkbox_id = current_checkbox_id.replace('_left', '_right'); + var other_checkbox_id = ''; + if (current_checkbox_id == left_checkbox_id) { + other_checkbox_id = right_checkbox_id; + } else { + other_checkbox_id = left_checkbox_id; + } + + // the default action has not been prevented so if we have + // just clicked this "if" is true + if ($('#' + current_checkbox_id).is(':checked')) { + $('#' + other_checkbox_id).attr('checked', true); + } else { + $('#' + other_checkbox_id).attr('checked', false); + } + }); +}) // end of $(document).ready() for verify other checkbox diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d568443..1e7b73a 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1515,7 +1515,7 @@ function PMA_displayVerticalTable() echo '<th></th>' . "\n"; } - echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_l', $val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_left', $val); $foo_counter++; } // end while echo '</tr>' . "\n"; @@ -1586,7 +1586,7 @@ function PMA_displayVerticalTable() echo '<th></th>' . "\n"; } - echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_r', $val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_right', $val); $foo_counter++; } // end while echo '</tr>' . "\n"; @@ -2463,7 +2463,8 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla $ret .= $column_style_vertical; $ret .= ' align="center">' . '<input type="checkbox" id="id_rows_to_delete' . $row_no . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"' - . ' onclick="' . $column_marker_vertical . 'copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'' . $id_suffix . '\');"' + . ' onclick="' . $column_marker_vertical . '"' + . ' class="verify_other_checkbox"' . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . ' </td>'; } @@ -2549,7 +2550,7 @@ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $ret = ''; if ($position == 'left') { - $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_l', '', '', ''); + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_left', '', '', ''); $ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, ''); @@ -2560,7 +2561,7 @@ function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, ''); - $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_r', '', '', ''); + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_right', '', '', ''); } return $ret; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 5513e430724261d274eff4342ad435c183ea055e
by Michal Čihař 24 Oct '10

24 Oct '10

The branch, master has been updated via 5513e430724261d274eff4342ad435c183ea055e (commit) via 6a2965f4d21fd8133b4e48c2df2c36d44ad316bd (commit) via ac151c177fcfaec34348ca2971d51fc646ba85dc (commit) via 412a578e53c9097d1d6e54f5ad2bc5f03ab0a44e (commit) via 54531d593dc63f449bc839f27777695e10f32609 (commit) via b46ffcab0078d56dadf6a21f94f98b4f99efc863 (commit) from ed18a0095371a42d1769f6bdceade236df999c6d (commit) - Log ----------------------------------------------------------------- commit 5513e430724261d274eff4342ad435c183ea055e Author: Michal Čihař <michal(a)cihar.com> Date: Sun Oct 24 13:31:18 2010 +0200 Update. commit 6a2965f4d21fd8133b4e48c2df2c36d44ad316bd Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Oct 22 10:25:07 2010 +0200 Translation update done using Pootle. commit ac151c177fcfaec34348ca2971d51fc646ba85dc Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Oct 22 10:24:32 2010 +0200 Translation update done using Pootle. commit 412a578e53c9097d1d6e54f5ad2bc5f03ab0a44e Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Oct 22 10:24:28 2010 +0200 Translation update done using Pootle. commit 54531d593dc63f449bc839f27777695e10f32609 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Oct 22 10:24:15 2010 +0200 Translation update done using Pootle. commit b46ffcab0078d56dadf6a21f94f98b4f99efc863 Author: Robert Readman <robert_readman(a)hotmail.com> Date: Fri Oct 22 10:24:04 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: addendum/html_credits.en_GB | 2 +- output/en_GB/Documentation.html | 2 +- po/en_GB.po | 25 +++++++++++-------------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/addendum/html_credits.en_GB b/addendum/html_credits.en_GB index d97fbe2..adbdc70 100644 --- a/addendum/html_credits.en_GB +++ b/addendum/html_credits.en_GB @@ -2,5 +2,5 @@ PO4A-HEADER:mode=before;position=<h2 id="glossary"> <p> This translation was brought to you by various translators on <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They -should have written their names here. +should have written their names there. </p> diff --git a/output/en_GB/Documentation.html b/output/en_GB/Documentation.html index b8fa8cb..37b6b11 100644 --- a/output/en_GB/Documentation.html +++ b/output/en_GB/Documentation.html @@ -5066,7 +5066,7 @@ and or just some feedback. <p> This translation was brought to you by various translators on <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. They -should have written their names here. +should have written their names there. </p> <h2 id="glossary">Glossary</h2> diff --git a/po/en_GB.po b/po/en_GB.po index 20f1626..ddd2d24 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-10-15 11:24+0300\n" -"PO-Revision-Date: 2010-09-07 19:49+0200\n" +"PO-Revision-Date: 2010-10-22 10:25+0200\n" "Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n" "Language-Team: none\n" "Language: en_GB\n" @@ -3699,13 +3699,12 @@ msgstr "$cfg['LoginCookieStore'] integer [number of seconds]" #. type: Content of: <html><body><div><dl><dd> #: ../phpmyadmin/Documentation.html:1385 -#, fuzzy msgid "" "Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." msgstr "" -"Define how long is login cookie should be stored in browser. Default 0 means " +"Define how long login cookie should be stored in browser. Default 0 means " "that it will be kept for existing session. This is recommended for not " "trusted environments." @@ -11011,7 +11010,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: ../phpmyadmin/Documentation.html:4079 -#, fuzzy msgid "" "You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages " "with many editing fields (table structure changes, row editing, etc.). You " @@ -11020,12 +11018,10 @@ msgid "" "eases up editing for you." msgstr "" "You can use Ctrl+arrows (Option+Arrows in Safari) for moving on most pages " -"with many editing fields (table structure changes, row editing, etc.) (must " -"be enabled in configuration - see. <a href=\"#CtrlArrowsMoving\" class=" -"\"configrule\">$cfg['CtrlArrowsMoving']</a>). You can also have a look at " -"the directive <a href=\"#DefaultPropDisplay\" class=\"configrule\">$cfg" -"['DefaultPropDisplay']</a> ('vertical') and see if this eases up editing for " -"you." +"with many editing fields (table structure changes, row editing, etc.). You " +"can also have a look at the directive <a href=\"#DefaultPropDisplay\" " +"class=\"configrule\">$cfg['DefaultPropDisplay']</a> ('vertical') and see if " +"this eases up editing for you." #. type: Content of: <html><body><div><h4> #: ../phpmyadmin/Documentation.html:4086 @@ -12979,15 +12975,13 @@ msgstr "AJAXifying the interface" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4831 -#, fuzzy msgid "Martynas Mickevičius (Google Summer of Code 2010)" -msgstr "Lori Lee (Google Summer of Code 2010)" +msgstr "Martynas Mickevičius (Google Summer of Code 2010)" #. type: Content of: <html><body><div><ul><li><ul><li> #: ../phpmyadmin/Documentation.html:4833 -#, fuzzy msgid "Charts" -msgstr "Charsets" +msgstr "Charts" #. type: Content of: <html><body><div><ul><li> #: ../phpmyadmin/Documentation.html:4836 @@ -14488,6 +14482,9 @@ msgid "" "\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>. They " "should have written their names here." msgstr "" +"This translation was brought to you by various translators on <a " +"href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a>. They " +"should have written their names there." #. type: Plain text #: addendum/comment.html:2 hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10698-gd3d149c
by Marc Delisle 22 Oct '10

22 Oct '10

The branch, master has been updated via d3d149c3605d8b26748d02aa6e534018e9fd123a (commit) from 36c23be35cc9d300d0a3fcf24320a3cde12b627d (commit) - Log ----------------------------------------------------------------- commit d3d149c3605d8b26748d02aa6e534018e9fd123a Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Oct 22 07:40:20 2010 -0400 refactoring for checkbox and links in Browse mode (vertical) ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 79 ++++++++++++++++++++++------------------- 1 files changed, 42 insertions(+), 37 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 12f1081..d568443 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1459,32 +1459,22 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { } if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - $vertical_display['row_delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n" - . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '[%_PMA_CHECKBOX_DIR_%]" name="rows_to_delete[' . $where_clause_html . ']"' - . ' onclick="' . $column_marker_vertical . 'copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'[%_PMA_CHECKBOX_DIR_%]\');"' - . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" - . ' </td>' . "\n"; + $vertical_display['row_delete'][$row_no] .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, '[%_PMA_CHECKBOX_DIR_%]', $alternating_color_class, $column_style_vertical, $column_marker_vertical); } else { unset($vertical_display['row_delete'][$row_no]); } if (isset($edit_url)) { - $vertical_display['edit'][$row_no] .= '<td align="center" class="' . $alternating_color_class . ' ' . $edit_anchor_class . '" ' . $column_style_vertical . '>' . "\n" - . PMA_linkOrButton($edit_url, $edit_str, array(), false); - // Generates the 'where_clause' hidden input field - // for inline ajax edit if required - if(! empty($where_clause) ) { - $vertical_display['edit'][$row_no] .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; - } - $vertical_display['edit'][$row_no] .= '</td>'; + $vertical_display['edit'][$row_no] .= PMA_generateEditLink($edit_url, $alternating_color_class . ' ' . $edit_anchor_class, $edit_str, $where_clause, $where_clause_html, $column_style_vertical); } else { unset($vertical_display['edit'][$row_no]); } if (isset($del_url)) { - $vertical_display['delete'][$row_no] .= ' <td align="center" class="' . $alternating_color_class . '" ' . $column_style_vertical . '>' . "\n" - . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), false) - . ' </td>' . "\n"; + if (! isset($js_conf)) { + $js_conf = ''; + } + $vertical_display['delete'][$row_no] .= PMA_generateDeleteLink($del_url, $del_str, $js_conf, $alternating_color_class, $column_style_vertical); } else { unset($vertical_display['delete'][$row_no]); } @@ -1525,7 +1515,7 @@ function PMA_displayVerticalTable() echo '<th></th>' . "\n"; } - echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '', $val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_l', $val); $foo_counter++; } // end while echo '</tr>' . "\n"; @@ -1596,7 +1586,7 @@ function PMA_displayVerticalTable() echo '<th></th>' . "\n"; } - echo str_replace('[%_PMA_CHECKBOX_DIR_%]', 'r', $val); + echo str_replace('[%_PMA_CHECKBOX_DIR_%]', '_r', $val); $foo_counter++; } // end while echo '</tr>' . "\n"; @@ -2457,15 +2447,23 @@ function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed * @param string $where_clause_html * @param string $del_query * @param string $id_suffix + * @param string $class + * @param string $column_style_vertical + * @param string $column_marker_vertical * @return string the generated HTML */ -function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix) { +function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix, $class, $column_style_vertical, $column_marker_vertical) { $ret = ''; if (! empty($del_url) && $is_display['del_lnk'] != 'kp') { - $ret .= '<td align="center">' - . '<input type="checkbox" id="id_rows_to_delete' . $row_no . '_' . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"' - . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'' . $id_suffix . '\');"' + $ret .= '<td '; + if (! empty($class)) { + $ret .= 'class="' . $class . '"'; + } + $ret .= $column_style_vertical; + $ret .= ' align="center">' + . '<input type="checkbox" id="id_rows_to_delete' . $row_no . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"' + . ' onclick="' . $column_marker_vertical . 'copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'' . $id_suffix . '\');"' . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . ' </td>'; } @@ -2477,17 +2475,18 @@ function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_cla * * @uses PMA_linkOrButton() * @param string $edit_url - * @param string $edit_anchor_class + * @param string $class * @param string $edit_str * @param string $where_clause * @param string $where_clause_html + * @param string $column_style_vertical * @return string the generated HTML */ -function PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html) { +function PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, $column_style_vertical) { $ret = ''; if (! empty($edit_url)) { - $ret .= '<td class="' . $edit_anchor_class . '" align="center">' - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); + $ret .= '<td class="' . $class . '" align="center" ' . $column_style_vertical . ' >' + . PMA_linkOrButton($edit_url, $edit_str, array(), FALSE); /* * Where clause for selecting this row uniquely is provided as * a hidden input. Used by jQuery scripts for handling inline editing @@ -2507,14 +2506,20 @@ function PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_c * @param string $del_url * @param string $del_str * @param string $js_conf + * @param string $class + * @param string $column_style_vertical * @return string the generated HTML */ -function PMA_generateDeleteLink($del_url, $del_str, $js_conf) { +function PMA_generateDeleteLink($del_url, $del_str, $js_conf, $class, $column_style_vertical) { $ret = ''; if (! empty($del_url)) { - $ret .= ' <td align="center">' + $ret .= '<td '; + if (! empty($class)) { + $ret .= 'class="' . $class . '" '; + } + $ret .= 'align="center" ' . $column_style_vertical . ' >' . PMA_linkOrButton($del_url, $del_str, $js_conf, FALSE) - . ' </td>'; + . '</td>'; } return $ret; } @@ -2534,28 +2539,28 @@ function PMA_generateDeleteLink($del_url, $del_str, $js_conf) { * @param string $del_query * @param string $id_suffix * @param string $edit_url - * @param string $edit_anchor_class + * @param string $class * @param string $edit_str * @param string $del_str * @param string $js_conf * @return string the generated HTML */ -function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $edit_anchor_class, $edit_str, $del_str, $js_conf) { +function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $class, $edit_str, $del_str, $js_conf) { $ret = ''; if ($position == 'left') { - $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='l'); + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_l', '', '', ''); - $ret .= PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html); + $ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, ''); - $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf); + $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf, '', ''); } elseif ($position == 'right') { - $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf); + $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf, '', ''); - $ret .= PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html); + $ret .= PMA_generateEditLink($edit_url, $class, $edit_str, $where_clause, $where_clause_html, ''); - $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='r'); + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='_r', '', '', ''); } return $ret; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10697-g36c23be
by Marc Delisle 21 Oct '10

21 Oct '10

The branch, master has been updated via 36c23be35cc9d300d0a3fcf24320a3cde12b627d (commit) from 1394cc65e8bb3b5218ffb83dd3cb8490498bfe80 (commit) - Log ----------------------------------------------------------------- commit 36c23be35cc9d300d0a3fcf24320a3cde12b627d Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Oct 21 09:25:36 2010 -0400 remove author names ----------------------------------------------------------------------- Summary of changes: js/functions.js | 4 +--- libraries/transformations/global.inc.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 2fe8530..b421d09 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1073,7 +1073,7 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol else if (theAction == 'click' && theMarkColor != '') { newColor = theMarkColor; marked_row[theRowNum] = true; - // Garvin: deactivated onclick marking of the checkbox because it's also executed + // Deactivated onclick marking of the checkbox because it's also executed // when an action (like edit/delete) on a single item is performed. Then the checkbox // would get deactived, even though we need it activated. Maybe there is a way // to detect if the row was clicked, and not an item therein... @@ -1257,7 +1257,6 @@ function setCheckboxes( container_id, state ) { } // end of the 'setCheckboxes()' function -// added 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de> // copy the checked from left to right or from right to left // so it's easier for users to see, if $cfg['ModifyAtRight']=true, what they've checked ;) function copyCheckboxesRange(the_form, the_name, the_clicked) @@ -1280,7 +1279,6 @@ function copyCheckboxesRange(the_form, the_name, the_clicked) } -// added 2004-05-08 by Michael Keck <mail_at_michaelkeck_dot_de> // - this was directly written to each td, so why not a function ;) // setCheckboxColumn(\'id_rows_to_delete' . $row_no . ''\'); function setCheckboxColumn(theCheckbox){ diff --git a/libraries/transformations/global.inc.php b/libraries/transformations/global.inc.php index 974f24f..120eed1 100644 --- a/libraries/transformations/global.inc.php +++ b/libraries/transformations/global.inc.php @@ -1,7 +1,7 @@ <?php /* vim: set expandtab sw=4 ts=4 sts=4: */ /** - * GLOBAL Plugin function (Garvin Hicking). + * GLOBAL Plugin function. * --------------- * * THIS FILE PROVIDES BASIC FUNCTIONS TO USE IN OTHER PLUGINS! hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10696-g1394cc6
by Marc Delisle 21 Oct '10

21 Oct '10

The branch, master has been updated via 1394cc65e8bb3b5218ffb83dd3cb8490498bfe80 (commit) from 10bbd76fc190ffb681e9c978e781f200c5da027b (commit) - Log ----------------------------------------------------------------- commit 1394cc65e8bb3b5218ffb83dd3cb8490498bfe80 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Oct 21 09:22:06 2010 -0400 refactoring for checkbox and links in Browse mode (horizontal) ----------------------------------------------------------------------- Summary of changes: libraries/display_tbl.lib.php | 125 +++++++++++++++++++++++++++++++++- libraries/display_tbl_links.lib.php | 71 -------------------- 2 files changed, 121 insertions(+), 75 deletions(-) delete mode 100644 libraries/display_tbl_links.lib.php diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0dafdec..12f1081 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1212,8 +1212,10 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) { - $doWriteModifyAt = 'left'; - require './libraries/display_tbl_links.lib.php'; + if (! isset($js_conf)) { + $js_conf = ''; + } + echo PMA_generateCheckboxAndLinks('left', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'l', $edit_url, $edit_anchor_class, $edit_str, $del_str, $js_conf); } // end if (1.3) } // end if (1) @@ -1425,8 +1427,10 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' || $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped')) { - $doWriteModifyAt = 'right'; - require './libraries/display_tbl_links.lib.php'; + if (! isset($js_conf)) { + $js_conf = ''; + } + echo PMA_generateCheckboxAndLinks('right', $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, 'r', $edit_url, $edit_anchor_class, $edit_str, $del_str, $js_conf); } // end if (3) if ($_SESSION['tmp_user_values']['disp_direction'] == 'horizontal' @@ -2442,4 +2446,117 @@ function PMA_prepare_row_data($mouse_events, $class, $condition_field, $analyzed return $result; } + +/** + * Generates a checkbox for multi-row submits + * + * @uses htmlspecialchars + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @return string the generated HTML + */ + +function PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix) { + $ret = ''; + if (! empty($del_url) && $is_display['del_lnk'] != 'kp') { + $ret .= '<td align="center">' + . '<input type="checkbox" id="id_rows_to_delete' . $row_no . '_' . $id_suffix . '" name="rows_to_delete[' . $where_clause_html . ']"' + . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'' . $id_suffix . '\');"' + . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' + . ' </td>'; + } + return $ret; +} + +/** + * Generates an Edit link + * + * @uses PMA_linkOrButton() + * @param string $edit_url + * @param string $edit_anchor_class + * @param string $edit_str + * @param string $where_clause + * @param string $where_clause_html + * @return string the generated HTML + */ +function PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html) { + $ret = ''; + if (! empty($edit_url)) { + $ret .= '<td class="' . $edit_anchor_class . '" align="center">' + . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); + /* + * Where clause for selecting this row uniquely is provided as + * a hidden input. Used by jQuery scripts for handling inline editing + */ + if(! empty($where_clause)) { + $ret .= '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; + } + $ret .= '</td>'; + } + return $ret; +} + +/** + * Generates a Delete link + * + * @uses PMA_linkOrButton() + * @param string $del_url + * @param string $del_str + * @param string $js_conf + * @return string the generated HTML + */ +function PMA_generateDeleteLink($del_url, $del_str, $js_conf) { + $ret = ''; + if (! empty($del_url)) { + $ret .= ' <td align="center">' + . PMA_linkOrButton($del_url, $del_str, $js_conf, FALSE) + . ' </td>'; + } + return $ret; +} + +/** + * Generates checkbox and links at some position (left or right) + * + * @uses PMA_generateCheckboxForMulti() + * @uses PMA_generateEditLink() + * @uses PMA_generateDeleteLink() + * @param string $position + * @param string $del_url + * @param array $is_display + * @param string $row_no + * @param string $where_clause + * @param string $where_clause_html + * @param string $del_query + * @param string $id_suffix + * @param string $edit_url + * @param string $edit_anchor_class + * @param string $edit_str + * @param string $del_str + * @param string $js_conf + * @return string the generated HTML + */ +function PMA_generateCheckboxAndLinks($position, $del_url, $is_display, $row_no, $where_clause, $where_clause_html, $del_query, $id_suffix, $edit_url, $edit_anchor_class, $edit_str, $del_str, $js_conf) { + $ret = ''; + + if ($position == 'left') { + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='l'); + + $ret .= PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html); + + $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf); + + } elseif ($position == 'right') { + $ret .= PMA_generateDeleteLink($del_url, $del_str, $js_conf); + + $ret .= PMA_generateEditLink($edit_url, $edit_anchor_class, $edit_str, $where_clause, $where_clause_html); + + $ret .= PMA_generateCheckboxForMulti($del_url, $is_display, $row_no, $where_clause_html, $del_query, $id_suffix='r'); + } + return $ret; +} ?> diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php deleted file mode 100644 index 43603de..0000000 --- a/libraries/display_tbl_links.lib.php +++ /dev/null @@ -1,71 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * - * - bugfix for select all checkboxes - * - copy right to left (or left to right) if user click on a check box - * - reversed the right modify links: 1. drop, 2. edit, 3. checkbox - * - also changes made in js/functions.js - * - * @package phpMyAdmin - */ -if (! defined('PHPMYADMIN')) { - exit; -} - -/** - * - */ -if ($doWriteModifyAt == 'left') { - - if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - echo ' <td align="center">' . "\n" - . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $where_clause_html . ']"' - . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'l\');"' - . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" - . ' </td>' . "\n"; - } - if (!empty($edit_url)) { - echo '<td class="' . $edit_anchor_class . '" align="center">' - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); - /* - * Where clause for selecting this row uniquely is provided as - * a hidden input. Used by jQuery scripts for handling inline editing - */ - if(! empty($where_clause)) { - echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; - } - echo '</td>'; - } - if (!empty($del_url)) { - echo ' <td align="center">' . "\n" - . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) - . ' </td>' . "\n"; - } -} elseif ($doWriteModifyAt == 'right') { - if (!empty($del_url)) { - echo ' <td align="center">' . "\n" - . PMA_linkOrButton($del_url, $del_str, (isset($js_conf) ? $js_conf : ''), FALSE) - . ' </td>' . "\n"; - } - if (!empty($edit_url)) { - echo '<td class="' . $edit_anchor_class . '" align="center">' - . PMA_linkOrButton($edit_url, $edit_str, '', FALSE); - /* - * Where clause for selecting this row uniquely is provided as - * a hidden input. Used by jQuery scripts for handling inline editing - */ - if(! empty($where_clause)) { - echo '<input type="hidden" class="where_clause" value ="' . $where_clause_html . '" />'; - } - echo ' </td>'; - } - if (!empty($del_url) && $is_display['del_lnk'] != 'kp') { - echo ' <td align="center">' . "\n" - . ' <input type="checkbox" id="id_rows_to_delete' . $row_no . 'r" name="rows_to_delete[' . $where_clause_html . ']"' - . ' onclick="copyCheckboxesRange(\'rowsDeleteForm\', \'id_rows_to_delete' . $row_no . '\',\'r\');"' - . ' value="' . htmlspecialchars($del_query) . '" ' . (isset($GLOBALS['checkall']) ? 'checked="checked"' : '') . ' />' . "\n" - . ' </td>' . "\n"; - } -} -?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10695-g10bbd76
by Michal Čihař 21 Oct '10

21 Oct '10

The branch, master has been updated via 10bbd76fc190ffb681e9c978e781f200c5da027b (commit) from 3ac470ec00c851b698bd3a23efbb3a5ee70e1173 (commit) - Log ----------------------------------------------------------------- commit 10bbd76fc190ffb681e9c978e781f200c5da027b Author: Michal Čihař <michal(a)cihar.com> Date: Thu Oct 21 11:32:49 2010 +0200 bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/List_Database.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65c9b0b..604683c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ tables. - rfe #2956556 [interface] Allow to wrap enum values. - bug #1669459 [interface] Do not automatically mark PDF schema rows to delete +- bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character. 3.3.9.0 (not yet released) diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php index f793ed4..c94f438 100644 --- a/libraries/List_Database.class.php +++ b/libraries/List_Database.class.php @@ -308,7 +308,7 @@ require_once './libraries/List.class.php'; // have the db name, the separator, then the rest which // might contain a separator // like dbname_the_rest - $pos = strpos($db, $separator); + $pos = strpos($db, $separator, 1); if ($pos !== false) { break; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10694-g3ac470e
by Michal Čihař 21 Oct '10

21 Oct '10

The branch, master has been updated via 3ac470ec00c851b698bd3a23efbb3a5ee70e1173 (commit) via 32320f907904a0a491dad17b20929b4c320fd763 (commit) via 694d0d55639bfe23d111e1f217aacdb69b4f8346 (commit) from 8b7180e05a0e261aaa2e84ac002ef25c7a6624ea (commit) - Log ----------------------------------------------------------------- commit 3ac470ec00c851b698bd3a23efbb3a5ee70e1173 Merge: 8b7180e05a0e261aaa2e84ac002ef25c7a6624ea 32320f907904a0a491dad17b20929b4c320fd763 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Oct 21 10:12:44 2010 +0200 Merge remote branch 'mort-dev/master' commit 32320f907904a0a491dad17b20929b4c320fd763 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Oct 21 10:12:22 2010 +0200 No collation selection for Drizzle. commit 694d0d55639bfe23d111e1f217aacdb69b4f8346 Author: Michal Čihař <michal(a)cihar.com> Date: Thu Oct 21 10:12:10 2010 +0200 Provide description for utf8 in Drizzle. ----------------------------------------------------------------------- Summary of changes: libraries/mysql_charsets.lib.php | 2 +- main.php | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php index 2463f1f..89aef18 100644 --- a/libraries/mysql_charsets.lib.php +++ b/libraries/mysql_charsets.lib.php @@ -14,7 +14,7 @@ if (! defined('PHPMYADMIN')) { if (PMA_MYSQL_MAJOR_VERSION > 2009) { /* There are no charsets in Drizzle */ $GLOBALS['mysql_charsets'] = array(); - $GLOBALS['mysql_charsets_descriptions'] = array(); + $GLOBALS['mysql_charsets_descriptions'] = array('utf8' => 'UTF-8 Unicode'); $GLOBALS['mysql_charsets_count'] = 0; $GLOBALS['mysql_charsets_available'] = array(); $GLOBALS['mysql_collations'] = array(); diff --git a/main.php b/main.php index 6e515d9..3f5f106 100644 --- a/main.php +++ b/main.php @@ -91,19 +91,21 @@ if ($server > 0 './user_password.php?' . $common_url_query, null, null, 'change_password_anchor'); } } // end if - echo ' <li id="li_select_mysql_collation">'; - echo ' <form method="post" action="index.php" target="_parent">' . "\n" - . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') - . ' <label for="select_collation_connection">' . "\n" - . ' ' . __('MySQL connection collation') . "\n" - // put the doc link in the form so that it appears on the same line - . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n" - . ' </label>' . "\n" - - . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true) - . ' <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n" - . ' </form>' . "\n" - . ' </li>' . "\n"; + if (PMA_MYSQL_MAJOR_VERSION < 2009) { + echo ' <li id="li_select_mysql_collation">'; + echo ' <form method="post" action="index.php" target="_parent">' . "\n" + . PMA_generate_common_hidden_inputs(null, null, 4, 'collation_connection') + . ' <label for="select_collation_connection">' . "\n" + . ' ' . __('MySQL connection collation') . "\n" + // put the doc link in the form so that it appears on the same line + . PMA_showMySQLDocu('MySQL_Database_Administration', 'Charset-connection') . ': ' . "\n" + . ' </label>' . "\n" + + . PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'collation_connection', 'select_collation_connection', $collation_connection, true, 4, true) + . ' <noscript><input type="submit" value="' . __('Go') . '" /></noscript>' . "\n" + . ' </form>' . "\n" + . ' </li>' . "\n"; + } // not Drizzle } // end of if ($server > 0) echo '</ul>'; echo '</div>'; hooks/post-receive -- phpMyAdmin

1 0