[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13745-g3906320

[Michal Čihař]

The branch, master has been updated
       via  390632084437d6e9835aaf66c7b0c45959196bc6 (commit)
       via  d6a0741cf8ecdad3eb0ba588c6ab4a5bbd283277 (commit)
       via  f08d2ded46658fcd67ffe4b3ab26d2bc405ffeb1 (commit)
      from  4976a5fa5caab47a221598dd4b43182fb36eea11 (commit)


- Log -----------------------------------------------------------------
commit 390632084437d6e9835aaf66c7b0c45959196bc6
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Aug 9 07:37:24 2011 +0200

    Unused variable

commit d6a0741cf8ecdad3eb0ba588c6ab4a5bbd283277
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Aug 9 07:37:08 2011 +0200

    Check for correct variable

commit f08d2ded46658fcd67ffe4b3ab26d2bc405ffeb1
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Aug 9 07:36:11 2011 +0200

    Unused variable

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

Summary of changes:
 libraries/Theme_Manager.class.php |    1 -
 libraries/sqlparser.lib.php       |    3 +--
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index eac54ef..174c031 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -284,7 +284,6 @@ class PMA_Theme_Manager
             $select_box .=  PMA_generate_common_hidden_inputs();
         }
 
-        $theme_selected = false;
         $theme_preview_path= './themes.php';
         $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" class="themeselect">';
         $select_box .=  $theme_preview_href . __('Theme') . '</a>:' . "\n";
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 10c7547..bde23e3 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -221,7 +221,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         }
 
         // Create local hashtables
-        if (!isset($PMA_SQPdata_column_attrib_cnt)) {
+        if (!isset($PMA_SQPdata_column_attrib)) {
             $PMA_SQPdata_column_attrib  = array_flip(
                 $GLOBALS['PMA_SQPdata_column_attrib']
                 );
@@ -348,7 +348,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                 $quotetype       = $c;
                 $count2++;
                 $escaped         = false;
-                $escaped_escaped = false;
                 $pos             = $count2;
                 $oldpos          = 0;
                 do {


hooks/post-receive
-- 
phpMyAdmin