[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3-6463-gcbf00bc

[Piotr Przybylski]

The branch, master has been updated
       via  cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea (commit)
       via  00946276e7d8f2929d0fb5f4cc33f2e9b34da195 (commit)
      from  63e30cd106e22d85b383430390f8b33cf144002f (commit)


- Log -----------------------------------------------------------------
commit cbf00bca6ccbe25ec1210f860c0f2c3c22c5c3ea
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Thu Jun 30 00:49:08 2011 +0200

    Remove unused variables

commit 00946276e7d8f2929d0fb5f4cc33f2e9b34da195
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Wed Jun 29 21:30:54 2011 +0200

    Fix column ordering when query has LIMIT, PROCEDURE, FOR UPDATE or LOCK IN SHARE MODE and contains newline

-----------------------------------------------------------------------

Summary of changes:
 libraries/display_tbl.lib.php     |    2 +-
 libraries/replication_gui.lib.php |    2 +-
 server_privileges.php             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 8fd73de..3a39bc6 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -876,7 +876,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
                 $order_img   = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />';
             }
 
-            if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@i', $unsorted_sql_query, $regs3)) {
+            if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $regs3)) {
                 $sorted_sql_query = $regs3[1] . $sort_order . $regs3[2];
             } else {
                 $sorted_sql_query = $unsorted_sql_query . $sort_order;
diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php
index 1c48982..ac80467 100644
--- a/libraries/replication_gui.lib.php
+++ b/libraries/replication_gui.lib.php
@@ -206,7 +206,7 @@ function PMA_replication_get_username_hostname_length() {
     $fields_info = PMA_DBI_get_columns('mysql', 'user');
     $username_length = 16;
     $hostname_length = 41;
-    foreach ($fields_info as $key => $val) {
+    foreach ($fields_info as $val) {
         if ($val['Field'] == 'User') {
             strtok($val['Type'], '()');
             $v = strtok('()');
diff --git a/server_privileges.php b/server_privileges.php
index 7cd802f..0e75d39 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -666,7 +666,7 @@ function PMA_displayLoginInformationFields($mode = 'new')
     $fields_info = PMA_DBI_get_columns('mysql', 'user', true);
     $username_length = 16;
     $hostname_length = 41;
-    foreach ($fields_info as $key => $val) {
+    foreach ($fields_info as $val) {
         if ($val['Field'] == 'User') {
             strtok($val['Type'], '()');
             $v = strtok('()');


hooks/post-receive
-- 
phpMyAdmin