Git January 2011

git@phpmyadmin.net

5 participants
154 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 0594f2a5819237e87f3d92c19aca738c2ede6c38
by Michal Čihař 10 Jan '11

10 Jan '11

The branch, master has been updated via 0594f2a5819237e87f3d92c19aca738c2ede6c38 (commit) via 0042969a713156e397b69845dc2c93ba338330fd (commit) from 5b548054c6de7646a7cd4b6a4067bfcff6f0b526 (commit) - Log ----------------------------------------------------------------- commit 0594f2a5819237e87f3d92c19aca738c2ede6c38 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 10 16:11:35 2011 +0100 Better look of green buttons in modern browsers. commit 0042969a713156e397b69845dc2c93ba338330fd Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Jan 10 16:06:41 2011 +0100 Add theme contest box. ----------------------------------------------------------------------- Summary of changes: css/style.css | 12 +++++++++++- templates/_littleboxes.tpl | 4 ++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/css/style.css b/css/style.css index 03ad0f7..f0f41f5 100644 --- a/css/style.css +++ b/css/style.css @@ -133,7 +133,7 @@ div.rightbutton { margin-top: 1em; margin-bottom: 1em; margin-right: 2em; - border: 1px solid #8dea34; + border: 1px solid white; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; @@ -142,6 +142,16 @@ div.rightbutton { font-weight: bolder; width: 12em; text-align: center; + -moz-box-shadow:0px 0px 8px #AAA; + -webkit-box-shadow:0px 0px 8px #AAA; + box-shadow:0px 0px 8px #AAA; + -webkit-transition:-webkit-box-shadow 0.1s ease-out; + -moz-transition:-webkit-box-shadow 0.1s ease-out; + -o-transition:-webkit-box-shadow 0.1s ease-out; + transition:-webkit-box-shadow 0.1s ease-out; +} +div.rightbutton:hover { + background-color: #8dea34; } div.rightbutton a { diff --git a/templates/_littleboxes.tpl b/templates/_littleboxes.tpl index 6248db7..e3e59c6 100644 --- a/templates/_littleboxes.tpl +++ b/templates/_littleboxes.tpl @@ -18,6 +18,10 @@ <span class="dlname"><a href="${base_url}donate.${file_ext}" rel="payment">Donate to phpMyAdmin</a></span> </div> +<div class="rightbutton"> + <span class="dlname"><a href="http://wiki.phpmyadmin.net/pma/Theme_Contest" title="phpMyAdmin is choosing new theme, it can be yours!">Theme contest!</a></span> +</div> + </div> </html> hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-32-g7e1cdb9
by Michal Čihař 10 Jan '11

10 Jan '11

The branch, master has been updated via 7e1cdb9980188081764ee321bca822b1321f62ef (commit) via 55a6317bce79bc23f9a54f740c17f9c2a2ba5892 (commit) via 023676f2ae7bd2e55588ab18be9cf8f1d57a0dd7 (commit) via 5e94750a1ef0396da81234c7d8271fdf86569977 (commit) via 01288986602c5923a6cb0be219043051e33207b1 (commit) via 89a2e86f9766c61ed3dfdf7f01bcaf01f33866eb (commit) via bb739f172345be9ef0da371277061750849de0df (commit) via 95b0da61e8ea6156aa17a3a3926f2094184ed69e (commit) via 180cb9089845450ac4cb5ef36cbff4009fb6bf9b (commit) via b7aafc935de5489fc84c3ceb5eb19a22f04eae27 (commit) via a462c27d7b3e8afa74277f2a96397a1323690f89 (commit) from 3ddd2e14ef09b899a65ee69d96d0a22534717780 (commit) - Log ----------------------------------------------------------------- commit 7e1cdb9980188081764ee321bca822b1321f62ef Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:23:25 2011 +0200 Translation update done using Pootle. commit 55a6317bce79bc23f9a54f740c17f9c2a2ba5892 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:23:11 2011 +0200 Translation update done using Pootle. commit 023676f2ae7bd2e55588ab18be9cf8f1d57a0dd7 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:35 2011 +0200 Translation update done using Pootle. commit 5e94750a1ef0396da81234c7d8271fdf86569977 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:28 2011 +0200 Translation update done using Pootle. commit 01288986602c5923a6cb0be219043051e33207b1 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:24 2011 +0200 Translation update done using Pootle. commit 89a2e86f9766c61ed3dfdf7f01bcaf01f33866eb Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:16 2011 +0200 Translation update done using Pootle. commit bb739f172345be9ef0da371277061750849de0df Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:11 2011 +0200 Translation update done using Pootle. commit 95b0da61e8ea6156aa17a3a3926f2094184ed69e Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:22:04 2011 +0200 Translation update done using Pootle. commit 180cb9089845450ac4cb5ef36cbff4009fb6bf9b Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:21:52 2011 +0200 Translation update done using Pootle. commit b7aafc935de5489fc84c3ceb5eb19a22f04eae27 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:21:25 2011 +0200 Translation update done using Pootle. commit a462c27d7b3e8afa74277f2a96397a1323690f89 Author: Michal Čihař <michal(a)cihar.com> Date: Mon Jan 10 14:20:50 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/cs.po | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/po/cs.po b/po/cs.po index c5ed62c..7e12be1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2010-12-31 12:53+0100\n" +"PO-Revision-Date: 2011-01-10 14:23+0200\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.0.5\n" @@ -4588,10 +4588,9 @@ msgid "bzipped" msgstr "zabzipováno" #: libraries/display_export.lib.php:326 -#, fuzzy #| msgid "Save output to a file" msgid "View output as text" -msgstr "Uložit do souboru" +msgstr "Zobrazit výstup jako text" #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 @@ -4607,6 +4606,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Posuňte se níže pro nastavení vybraného formátu a ignorujte nastavení " +"ostatních." #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" @@ -5274,7 +5275,7 @@ msgstr "Nahradit NULL hodnoty:" #: libraries/export/csv.php:26 libraries/export/excel.php:23 msgid "Remove carriage return/line feed characters within columns" -msgstr "Odstranit znaky konců řádek z polí:" +msgstr "Odstranit znaky konců řádek z polí" #: libraries/export/excel.php:32 msgid "Excel edition:" @@ -7115,7 +7116,7 @@ msgstr "Nepodařilo se nahrát konfiguraci" #: prefs_manage.php:112 msgid "Configuration contains incorrect data for some fields." -msgstr "Nastavení obsahuje neplatné data pro některé položky" +msgstr "Nastavení obsahuje neplatná data pro některé položky." #: prefs_manage.php:128 msgid "Do you want to import remaining settings?" @@ -7135,7 +7136,7 @@ msgstr "Načíst z úložiště v prohlížeči" #: prefs_manage.php:248 msgid "Settings will be imported from your browser's local storage." -msgstr "Nastavení bude načteno z lokálního úložiště ve vašem prohlížeči" +msgstr "Nastavení bude načteno z lokálního úložiště ve vašem prohlížeči." #: prefs_manage.php:254 msgid "You have no saved settings!" @@ -7782,7 +7783,7 @@ msgstr "" #: server_replication.php:219 msgid "Replicate all databases; Ignore:" -msgstr "Replikovat všechny databáze s výjimkou::" +msgstr "Replikovat všechny databáze s výjimkou:" #: server_replication.php:220 msgid "Ignore all databases; Replicate:" @@ -7870,7 +7871,7 @@ msgstr "Práce s chybami:" msgid "Skipping errors might lead into unsynchronized master and slave!" msgstr "" "Přeskakování chyb může vést k rozdílným datům na nadřízeném a podřízeném " -"serveru." +"serveru!" #: server_replication.php:342 msgid "Skip current error" @@ -9038,7 +9039,7 @@ msgstr "" #: setup/lib/index.lib.php:256 #, php-format msgid "This %soption%s should be enabled if your web server supports it." -msgstr "Měli byste použít %sSSL připojení%s pokud to váš webserver podporuje" +msgstr "Pokud to váš webserver podporuje, měli byste použít %sSSL připojení%s." #: setup/lib/index.lib.php:258 #, php-format @@ -9127,7 +9128,7 @@ msgstr "" #: setup/lib/index.lib.php:296 msgid "You should use SSL connections if your web server supports it." -msgstr "Měli byste použít SSL připojení pokud to váš webserver podporuje." +msgstr "Pokud to váš webserver podporuje, měli byste použít SSL připojení." #: setup/lib/index.lib.php:306 msgid "You should use mysqli for performance reasons." @@ -9248,7 +9249,7 @@ msgstr "Pokračovat ve vkládání s %s řádky" #: tbl_chart.php:56 msgid "Chart generated successfully." -msgstr "Graf byl úspěšně vytvořen" +msgstr "Graf byl úspěšně vytvořen." #: tbl_chart.php:59 msgid "" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-21-g3ddd2e1
by Marc Delisle 09 Jan '11

09 Jan '11

The branch, master has been updated via 3ddd2e14ef09b899a65ee69d96d0a22534717780 (commit) from 76483d6b4dbd848d2e3ef0a3f2b4b59e0f27029e (commit) - Log ----------------------------------------------------------------- commit 3ddd2e14ef09b899a65ee69d96d0a22534717780 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 9 08:07:49 2011 -0500 Page selector in Browse foreigners window did not trigger on change ----------------------------------------------------------------------- Summary of changes: js/functions.js | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 3da6c69..5498f93 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2442,11 +2442,20 @@ $(document).ready(function() { $('#tableslistcontainer').find('#pageselector').live('change', function() { $(this).parent("form").submit(); }); + /** * Page selector in navi panel (non-AJAX) */ $('#navidbpageselector').find('#pageselector').live('change', function() { $(this).parent("form").submit(); }); + + /** + * Page selector in browse_foreigners windows (non-AJAX) + */ + $('#body_browse_foreigners').find('#pageselector').live('change', function() { + $(this).closest("form").submit(); + }); + }) // end of $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-20-g76483d6
by Marc Delisle 09 Jan '11

09 Jan '11

The branch, master has been updated via 76483d6b4dbd848d2e3ef0a3f2b4b59e0f27029e (commit) from b41947d46e9ba888cc6f7f94af23e134bf412e08 (commit) - Log ----------------------------------------------------------------- commit 76483d6b4dbd848d2e3ef0a3f2b4b59e0f27029e Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 9 08:01:05 2011 -0500 Page selector in Databases tab did not trigger on change ----------------------------------------------------------------------- Summary of changes: server_databases.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/server_databases.php b/server_databases.php index af4b3cf..8c81553 100644 --- a/server_databases.php +++ b/server_databases.php @@ -116,6 +116,7 @@ if ($server > 0) { * Displays the page */ if ($databases_count > 0) { + echo '<div id="tableslistcontainer">'; reset($databases); $first_database = current($databases); // table col order @@ -261,6 +262,7 @@ if ($databases_count > 0) { echo '</li>' . "\n" . '</ul>' . "\n"; } echo '</form>'; + echo '</div>'; } else { echo __('No databases'); } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-19-gb41947d
by Marc Delisle 09 Jan '11

09 Jan '11

The branch, master has been updated via b41947d46e9ba888cc6f7f94af23e134bf412e08 (commit) from 27624c6875f8d36be974215a2bd2a4f65516b942 (commit) - Log ----------------------------------------------------------------- commit b41947d46e9ba888cc6f7f94af23e134bf412e08 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Jan 9 07:52:30 2011 -0500 Page selector in navi panel and in db Structure did not trigger on change ----------------------------------------------------------------------- Summary of changes: db_structure.php | 2 ++ js/functions.js | 13 +++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/db_structure.php b/db_structure.php index 0004d37..fb2ecc0 100644 --- a/db_structure.php +++ b/db_structure.php @@ -83,6 +83,7 @@ if ($num_tables == 0) { /** * Displays the tables list */ +echo '<div id="tableslistcontainer">'; $_url_params = array( 'pos' => $pos, 'db' => $db); @@ -530,6 +531,7 @@ if (!$db_is_information_schema) { // display again the table list navigator PMA_listNavigator($total_num_tables, $pos, $_url_params, 'db_structure.php', 'frame_content', $GLOBALS['cfg']['MaxTableList']); ?> +</div> <hr /> <?php diff --git a/js/functions.js b/js/functions.js index 5ad3c40..3da6c69 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2435,5 +2435,18 @@ $(document).ready(function() { */ $('#visual_builder_anchor').show(); + + /** + * Page selector in db Structure (non-AJAX) + */ + $('#tableslistcontainer').find('#pageselector').live('change', function() { + $(this).parent("form").submit(); + }); + /** + * Page selector in navi panel (non-AJAX) + */ + $('#navidbpageselector').find('#pageselector').live('change', function() { + $(this).parent("form").submit(); + }); }) // end of $(document).ready() hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-18-g27624c6
by Michal Čihař 09 Jan '11

09 Jan '11

The branch, master has been updated via 27624c6875f8d36be974215a2bd2a4f65516b942 (commit) via c7cd3ae391fe2f255e44b65452810cae805b2017 (commit) from 26126bec307fbe08d58b32be04b294a47bc3d8fc (commit) - Log ----------------------------------------------------------------- commit 27624c6875f8d36be974215a2bd2a4f65516b942 Merge: c7cd3ae391fe2f255e44b65452810cae805b2017 26126bec307fbe08d58b32be04b294a47bc3d8fc Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 8 22:40:07 2011 +0100 Merge remote branch 'origin/master' commit c7cd3ae391fe2f255e44b65452810cae805b2017 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 8 23:03:25 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index fdcdc66..f7b02d7 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-08 21:03+0200\n" +"PO-Revision-Date: 2011-01-08 23:03+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "Language: tr\n" @@ -4627,6 +4627,8 @@ msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." msgstr "" +"Seçili biçimde seçenekleri doldurmak için aşağı kaydır ve diğer biçimler " +"için seçenekleri yoksay." #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-16-g26126be
by Marc Delisle 08 Jan '11

08 Jan '11

The branch, master has been updated via 26126bec307fbe08d58b32be04b294a47bc3d8fc (commit) via 6094e6c644a50519731b9413f6e7c4418747d65e (commit) from 797d2466e6cb7910fb8808e194b0d8f25258e97d (commit) - Log ----------------------------------------------------------------- commit 26126bec307fbe08d58b32be04b294a47bc3d8fc Merge: 6094e6c644a50519731b9413f6e7c4418747d65e 797d2466e6cb7910fb8808e194b0d8f25258e97d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 8 15:16:12 2011 -0500 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 6094e6c644a50519731b9413f6e7c4418747d65e Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 8 15:14:00 2011 -0500 - Bug #3151925 Page selector dropdown broken with ORDER BY query - PMA_pageselector() had an unused parameter ----------------------------------------------------------------------- Summary of changes: browse_foreigners.php | 6 ------ js/sql.js | 5 +++-- libraries/common.lib.php | 5 +---- libraries/display_tbl.lib.php | 8 ++++---- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/browse_foreigners.php b/browse_foreigners.php index a936d60..be68981 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -59,12 +59,6 @@ if (is_array($foreignData['disp_row'])) { if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) { $gotopage = PMA_pageselector( - 'browse_foreigners.php?field=' . urlencode($field) . - '&' . PMA_generate_common_url($db, $table) - . $rownumber_param . - '&fieldkey=' . (isset($fieldkey) ? urlencode($fieldkey) : '') . - '&foreign_filter=' . (isset($foreign_filter) ? urlencode($foreign_filter) : '') . - '&', $session_max_rows, $pageNow, $nbTotalPage, diff --git a/js/sql.js b/js/sql.js index 53d6a29..e985be2 100644 --- a/js/sql.js +++ b/js/sql.js @@ -295,11 +295,12 @@ $(document).ready(function() { event.preventDefault(); PMA_ajaxShowMessage(); + var $the_form = $(this).parent("form"); - $.get($(this).attr('href'), $(this).serialize() + '&ajax_request=true', function(data) { + $.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) { $("#sqlqueryresults").html(data); $("#sqlqueryresults").trigger('appendAnchor'); - }) // end $.get() + }) // end $.post() })// end Paginate results with Page Selector /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0e8a70c..3976431 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2173,9 +2173,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, /** * Generate a pagination selector for browsing resultsets * - * @todo $url is not javascript escaped!? * @uses range() - * @param string URL for the JavaScript * @param string Number of rows in the pagination set * @param string current page number * @param string number of total pages @@ -2195,7 +2193,7 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text, * * @access public */ -function PMA_pageselector($url, $rows, $pageNow = 1, $nbTotalPage = 1, +function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, $showAll = 200, $sliceStart = 5, $sliceEnd = 5, $percent = 20, $range = 10, $prompt = '') { @@ -2320,7 +2318,6 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n"; echo PMA_generate_common_hidden_inputs($_url_params); echo PMA_pageselector( - $script . PMA_generate_common_url($_url_params) . '&', $max_count, floor(($pos + 1) / $max_count) + 1, ceil($count / $max_count)); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index ca56955..53c610b 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -370,8 +370,6 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo     </td> <td> - <?php //<form> for keep the form alignment of button < and << ?> - <form action="none"> <?php $_url_params = array( 'db' => $db, @@ -379,9 +377,11 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo 'sql_query' => $sql_query, 'goto' => $goto, ); + //<form> to keep the form alignment of button < and << + // and also to know what to execute when the selector changes + echo '<form action="sql.php' . PMA_generate_common_url($_url_params). '" method="post">'; echo PMA_pageselector( - 'sql.php' . PMA_generate_common_url($_url_params) . PMA_get_arg_separator('js'), - $_SESSION['tmp_user_values']['max_rows'], + $_SESSION['tmp_user_values']['max_rows'], $pageNow, $nbTotalPage, 200, hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-14-g797d246
by Michal Čihař 08 Jan '11

08 Jan '11

The branch, master has been updated via 797d2466e6cb7910fb8808e194b0d8f25258e97d (commit) via 2e430ca4c054e08bdacaddc7710fd34578a0d774 (commit) from 45eb47fe145dae49cdf6d4b4ffc6a2c9ac752223 (commit) - Log ----------------------------------------------------------------- commit 797d2466e6cb7910fb8808e194b0d8f25258e97d Merge: 2e430ca4c054e08bdacaddc7710fd34578a0d774 45eb47fe145dae49cdf6d4b4ffc6a2c9ac752223 Author: Pootle server <pootle(a)cihar.com> Date: Sat Jan 8 20:40:08 2011 +0100 Merge remote branch 'origin/master' commit 2e430ca4c054e08bdacaddc7710fd34578a0d774 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Jan 8 21:03:33 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/po/tr.po b/po/tr.po index a04fd6b..fdcdc66 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-03 23:06+0200\n" +"PO-Revision-Date: 2011-01-08 21:03+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -4609,10 +4609,9 @@ msgid "bzipped" msgstr "bzip olarak" #: libraries/display_export.lib.php:326 -#, fuzzy #| msgid "Save output to a file" msgid "View output as text" -msgstr "Çıktıyı dosyaya kaydet" +msgstr "Çıktıyı metin olarak göster" #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-12-g45eb47f
by Marc Delisle 08 Jan '11

08 Jan '11

The branch, master has been updated via 45eb47fe145dae49cdf6d4b4ffc6a2c9ac752223 (commit) via 824458981388fbaad52c0e1d11db4c681bf03789 (commit) from 5c47f19ce88fad1687f213bfd00cee0cd391acc4 (commit) - Log ----------------------------------------------------------------- commit 45eb47fe145dae49cdf6d4b4ffc6a2c9ac752223 Merge: 5c47f19ce88fad1687f213bfd00cee0cd391acc4 824458981388fbaad52c0e1d11db4c681bf03789 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 8 13:45:40 2011 -0500 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/database_interface.lib.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 24 +++++++++++++++++++++--- libraries/dbi/mysqli.dbi.lib.php | 17 ++++++++++++++--- libraries/relation.lib.php | 10 ++++++++-- tbl_replace.php | 2 +- 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5f20f7c..2f30df3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -134,6 +134,7 @@ thanks to erickoh75 - erickoh75 - patch #3150164 [structure] Ordering by size gives incorrect results, thanks to Madhura Jayaratne - madhuracj +- bug #3153409 [core] 0 row(s) affected 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 0877dda..012eb7c 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -69,8 +69,8 @@ require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi /** * Common Functions */ -function PMA_DBI_query($query, $link = null, $options = 0) { - $res = PMA_DBI_try_query($query, $link, $options) +function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) { + $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows) or PMA_mysqlDie(PMA_DBI_getError($link), $query); return $res; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index c5ff26f..1db4f1e 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -154,7 +154,7 @@ function PMA_DBI_select_db($dbname, $link = null) * @param integer $options * @return mixed */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -175,6 +175,10 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) $r = mysql_query($query, $link); } + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -398,7 +402,16 @@ function PMA_DBI_insert_id($link = null) return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); } -function PMA_DBI_affected_rows($link = null) +/** + * returns the number of rows affected by last query + * + * @uses $GLOBALS['userlink'] + * @uses mysql_affected_rows() + * @param object mysql $link the mysql object + * @param boolean $get_from_cache + * @return string integer + */ +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -407,7 +420,12 @@ function PMA_DBI_affected_rows($link = null) return false; } } - return mysql_affected_rows($link); + + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysql_affected_rows($link); + } } /** diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index e027f23..8022c77 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -172,9 +172,10 @@ function PMA_DBI_select_db($dbname, $link = null) * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options + * @param boolean $cache_affected_rows * @return mixed true, false or result object */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; @@ -196,6 +197,11 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) $time = microtime(true); } $r = mysqli_query($link, $query, $method); + + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -455,9 +461,10 @@ function PMA_DBI_insert_id($link = '') * @uses $GLOBALS['userlink'] * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object + * @param boolean $get_from_cache * @return string integer */ -function PMA_DBI_affected_rows($link = null) +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -466,7 +473,11 @@ function PMA_DBI_affected_rows($link = null) return false; } } - return mysqli_affected_rows($link); + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysqli_affected_rows($link); + } } /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 960e890..18504e2 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -22,10 +22,16 @@ if (! defined('PHPMYADMIN')) { */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { + // Avoid caching of the number of rows affected; for example, this function + // is called for tracking purposes but we want to display the correct number + // of rows affected by the original query, not by the query generated for + // tracking. + $cache_affected_rows = false; + if ($show_error) { - $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options); + $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } else { - $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options); + $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } // end if... else... if ($result) { diff --git a/tbl_replace.php b/tbl_replace.php index f7371ec..7a60ddb 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -363,7 +363,7 @@ foreach ($query as $single_query) { if (! $result) { $error_messages[] = PMA_DBI_getError(); } else { - // the following is a real assignment: + // The next line contains a real assignment, it's not a typo if ($tmp = @PMA_DBI_affected_rows()) { $total_affected_rows += $tmp; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_9-10-g8244589
by Marc Delisle 08 Jan '11

08 Jan '11

The branch, QA_3_3 has been updated via 824458981388fbaad52c0e1d11db4c681bf03789 (commit) from 6135612dbb1150c6a0a6287246c8103ee637de93 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/database_interface.lib.php | 4 ++-- libraries/dbi/mysql.dbi.lib.php | 24 +++++++++++++++++++++--- libraries/dbi/mysqli.dbi.lib.php | 17 ++++++++++++++--- libraries/relation.lib.php | 10 ++++++++-- tbl_replace.php | 2 +- 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c67957..2831d07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA thanks to erickoh75 - erickoh75 - patch #3150164 [structure] Ordering by size gives incorrect results, thanks to Madhura Jayaratne - madhuracj +- bug #3153409 [core] 0 row(s) affected 3.3.9.0 (2011-01-03) - bug [doc] Fix references to MySQL doc diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 8da1035..6c321b1 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -79,8 +79,8 @@ require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi /** * Common Functions */ -function PMA_DBI_query($query, $link = null, $options = 0) { - $res = PMA_DBI_try_query($query, $link, $options) +function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true) { + $res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows) or PMA_mysqlDie(PMA_DBI_getError($link), $query); return $res; } diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index bf16114..6aa9c6a 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -155,7 +155,7 @@ function PMA_DBI_select_db($dbname, $link = null) * @param integer $options * @return mixed */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -176,6 +176,10 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) $r = mysql_query($query, $link); } + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -402,7 +406,16 @@ function PMA_DBI_insert_id($link = null) return PMA_DBI_fetch_value('SELECT LAST_INSERT_ID();', 0, 0, $link); } -function PMA_DBI_affected_rows($link = null) +/** + * returns the number of rows affected by last query + * + * @uses $GLOBALS['userlink'] + * @uses mysql_affected_rows() + * @param object mysql $link the mysql object + * @param boolean $get_from_cache + * @return string integer + */ +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -411,7 +424,12 @@ function PMA_DBI_affected_rows($link = null) return false; } } - return mysql_affected_rows($link); + + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysql_affected_rows($link); + } } /** diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index b064953..f1f037c 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -175,9 +175,10 @@ function PMA_DBI_select_db($dbname, $link = null) * @param string $query query to execute * @param object mysqli $link mysqli object * @param integer $options + * @param boolean $cache_affected_rows * @return mixed true, false or result object */ -function PMA_DBI_try_query($query, $link = null, $options = 0) +function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true) { if ($options == ($options | PMA_DBI_QUERY_STORE)) { $method = MYSQLI_STORE_RESULT; @@ -199,6 +200,11 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) $time = microtime(true); } $r = mysqli_query($link, $query, $method); + + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + } + if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; @@ -460,9 +466,10 @@ function PMA_DBI_insert_id($link = '') * @uses $GLOBALS['userlink'] * @uses mysqli_affected_rows() * @param object mysqli $link the mysqli object + * @param boolean $get_from_cache * @return string integer */ -function PMA_DBI_affected_rows($link = null) +function PMA_DBI_affected_rows($link = null, $get_from_cache = true) { if (empty($link)) { if (isset($GLOBALS['userlink'])) { @@ -471,7 +478,11 @@ function PMA_DBI_affected_rows($link = null) return false; } } - return mysqli_affected_rows($link); + if ($get_from_cache) { + return $GLOBALS['cached_affected_rows']; + } else { + return mysqli_affected_rows($link); + } } /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 6b1ac67..b98fb6a 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -29,10 +29,16 @@ require_once './libraries/Table.class.php'; */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { + // Avoid caching of the number of rows affected; for example, this function + // is called for tracking purposes but we want to display the correct number + // of rows affected by the original query, not by the query generated for + // tracking. + $cache_affected_rows = false; + if ($show_error) { - $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options); + $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } else { - $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options); + $result = @PMA_DBI_try_query($sql, $GLOBALS['controllink'], $options, $cache_affected_rows); } // end if... else... if ($result) { diff --git a/tbl_replace.php b/tbl_replace.php index a7da0bc..36e5d74 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -357,7 +357,7 @@ foreach ($query as $single_query) { if (! $result) { $error_messages[] = PMA_DBI_getError(); } else { - // the following is a real assignment: + // The next line contains a real assignment, it's not a typo if ($tmp = @PMA_DBI_affected_rows()) { $total_affected_rows += $tmp; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2011