remove unused variables

phpmyadmin · May 5, 2012 · 3bfee1e · 3bfee1e
1 parent 2889689
commit 3bfee1e
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 11 deletions.
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
@@ -240,8 +240,6 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
     function PMA_getTableDefStandIn($db, $view, $crlf)
     {
         $schema_insert = '<table class="width100" cellspacing="1">';
-
-        $columns_cnt = 4;
         $schema_insert .= '<tr class="print-category">';
         $schema_insert .= '<th class="print">'
             . __('Column')

diff --git a/libraries/export/sql.php b/libraries/export/sql.php
@@ -1185,7 +1185,6 @@ function PMA_getTableComments(
     ) {
         global $cfgRelation;
         global $sql_backquotes;
-        global $sql_constraints;
 
         $schema_create = '';
 

diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
@@ -234,8 +234,6 @@ function PMA_getTableDefStandIn($db, $view, $crlf)
          * Displays the table structure
          */
 
-        $columns_cnt = 4;
-
         $text_output .= "|------\n";
         $text_output .= '|' . __('Column');
         $text_output .= '|' . __('Type');

diff --git a/libraries/export/xml.php b/libraries/export/xml.php
@@ -267,7 +267,6 @@ function PMA_exportHeader()
                         $head .= '            </pma:function>' . $crlf;
                     }
 
-                    unset($create_func);
                     unset($function);
                     unset($functions);
                 }
@@ -293,7 +292,6 @@ function PMA_exportHeader()
                         $head .= '            </pma:procedure>' . $crlf;
                     }
 
-                    unset($create_proc);
                     unset($procedure);
                     unset($procedures);
                 }

diff --git a/libraries/import/mediawiki.php b/libraries/import/mediawiki.php
@@ -299,7 +299,7 @@ function PMA_importDataOneTable ($table)
  */
 function PMA_setTableName(&$table_name)
 {
-    if (empty($table_name) && strlen($db)) {
+    if (empty($table_name)) {
         $result = PMA_DBI_fetch_result('SHOW TABLES');
         // todo check if the name below already exists
         $table_name = 'TABLE '.(count($result) + 1);

diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php
@@ -984,7 +984,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
  */
 function PMA_RTN_getQueryFromRequest()
 {
-    global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_directions;
+    global $_REQUEST, $errors, $param_sqldataaccess, $param_directions;
 
     $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : '';
     $column_types = $GLOBALS['PMA_Types']->getColumns();
@@ -1134,7 +1134,7 @@ function PMA_RTN_getQueryFromRequest()
  */
 function PMA_RTN_handleExecute()
 {
-    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $cfg;
+    global $_GET, $_POST, $_REQUEST, $GLOBALS, $db;
 
     /**
      * Handle all user requests other than the default of listing routines

diff --git a/libraries/transformations/text_plain__external.inc.php b/libraries/transformations/text_plain__external.inc.php
@@ -93,7 +93,7 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
         }
         fclose($pipes[1]);
         // we don't currently use the return value
-        $return_value = proc_close($process);
+        proc_close($process);
     }
 
     if ($options[2] == 1 || $options[2] == '2') {