From 7f3ccd3b51a243afa8946fe729bac694e6c832c9 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 7 May 2010 18:10:35 +0200 Subject: [PATCH] Utilize single parameter implode --- adminer/drivers/mysql.inc.php | 2 +- adminer/drivers/pgsql.inc.php | 2 +- adminer/drivers/sqlite.inc.php | 4 ++-- compile.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 54dbf623..6d11195d 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -586,7 +586,7 @@ if (!defined("DRIVER")) { $alter = array(); foreach ($fields as $field) { $alter[] = ($field[1] - ? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode("", $field[1]) . ($table != "" ? " $field[2]" : "") + ? ($table != "" ? ($field[0] != "" ? "CHANGE " . idf_escape($field[0]) : "ADD") : " ") . " " . implode($field[1]) . ($table != "" ? " $field[2]" : "") : "DROP " . idf_escape($field[0]) ); } diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php index 00e8c41f..d1a6d564 100644 --- a/adminer/drivers/pgsql.inc.php +++ b/adminer/drivers/pgsql.inc.php @@ -348,7 +348,7 @@ WHERE tc.constraint_type = 'FOREIGN KEY' AND tc.table_name = " . $connection->qu $val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial"; } if ($field[0] == "") { - $alter[] = ($table != "" ? "ADD " : " ") . implode("", $val); + $alter[] = ($table != "" ? "ADD " : " ") . implode($val); } else { if ($column != $val[0]) { $queries[] = "ALTER TABLE " . idf_escape($table) . " RENAME $column TO $val[0]"; diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php index 5ad85500..262f8389 100644 --- a/adminer/drivers/sqlite.inc.php +++ b/adminer/drivers/sqlite.inc.php @@ -394,7 +394,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) { $alter = array(); foreach ($fields as $field) { if ($field[1]) { - $alter[] = ($table != "" && $field[0] == "" ? "ADD " : " ") . implode("", $field[1]); + $alter[] = ($table != "" && $field[0] == "" ? "ADD " : " ") . implode($field[1]); } } $alter = array_merge($alter, $foreign); @@ -524,7 +524,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) { function trigger_sql($table, $style) { global $connection; - return implode("", get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . $connection->quote($table))); + return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND name = " . $connection->quote($table))); } function show_variables() { diff --git a/compile.php b/compile.php index c112d8aa..bfc8ebe6 100644 --- a/compile.php +++ b/compile.php @@ -106,7 +106,7 @@ function php_shrink($input) { arsort($short_variables); foreach (array_keys($short_variables) as $number => $key) { - $short_variables[$key] = short_identifier($number, implode("", range('a', 'z')) . '_' . implode("", range('A', 'Z'))); // could use also numbers and \x7f-\xff + $short_variables[$key] = short_identifier($number, implode(range('a', 'z')) . '_' . implode(range('A', 'Z'))); // could use also numbers and \x7f-\xff } $set = array_flip(preg_split('//', '!"#$&\'()*+,-./:;<=>?@[\]^`{|}'));