diff --git a/libraries/config/ConfigFile.class.php b/libraries/config/ConfigFile.class.php index 4a02c467b1..64bc72d7f4 100644 --- a/libraries/config/ConfigFile.class.php +++ b/libraries/config/ConfigFile.class.php @@ -213,7 +213,7 @@ class ConfigFile // value if (!isset($this->persistKeys[$canonical_path])) { $default_value = $this->getDefault($canonical_path); - // we need oryginal config values not overwritten by user + // we need original config values not overwritten by user // preferences to allow for overwriting options set in // config.inc.php with default values $instance_default_value = PMA_array_read( diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index e3a114857a..ccb41d1a0f 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -240,8 +240,6 @@ if (isset($plugin_list)) { function PMA_getTableDefStandIn($db, $view, $crlf) { $schema_insert = '
| ' . __('Column') diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 5cdcf96075..5fc892eca0 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -1185,7 +1185,6 @@ if (isset($plugin_list)) { ) { global $cfgRelation; global $sql_backquotes; - global $sql_constraints; $schema_create = ''; diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index cc68d3ecbb..fd53b05a11 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -234,8 +234,6 @@ if (isset($plugin_list)) { * 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 index c318567302..7192d8c082 100644 --- a/libraries/export/xml.php +++ b/libraries/export/xml.php @@ -267,7 +267,6 @@ if (isset($plugin_list)) { $head .= ' ' . $crlf; } - unset($create_func); unset($function); unset($functions); } @@ -293,7 +292,6 @@ if (isset($plugin_list)) { $head .= ' ' . $crlf; } - unset($create_proc); unset($procedure); unset($procedures); } diff --git a/libraries/import/mediawiki.php b/libraries/import/mediawiki.php index bdfcd71b55..6a5bd9005a 100644 --- 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); @@ -317,7 +317,7 @@ function PMA_setTableName(&$table_name) */ function PMA_setTableHeaders(&$table_headers, $table_row) { - if ( empty($table_headers) ) { + if (empty($table_headers)) { // The first table row should contain the number of columns // If they are not set, generic names will be given (COL 1, COL 2, etc) $num_cols = count($table_row); @@ -486,4 +486,4 @@ function PMA_explodeMarkup($text) return $items; } -?> \ No newline at end of file +?> diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index 1ee9b31aa3..f6b324ed39 100644 --- 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/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php index 39483a4402..e4ccef1b25 100644 --- a/libraries/schema/Export_Relation_Schema.class.php +++ b/libraries/schema/Export_Relation_Schema.class.php @@ -224,7 +224,6 @@ class PMA_Export_Relation_Schema */ function dieSchema($pageNumber, $type = '', $error_message = '') { - global $cfg; global $db; include_once './libraries/header.inc.php'; diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index e2922b46a1..fa4637ffb8 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -284,7 +284,7 @@ class PMA_User_Schema $i = 0; $odd_row = true; - foreach ($array_sh_page as $dummy_sh_page => $sh_page) { + foreach ($array_sh_page as $sh_page) { $_mtab = $sh_page['table_name']; $tabExist[$_mtab] = false; echo "\n" . ' |
|---|