From 700fd8b4bd32b17136aa93c516e358e260633661 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Wed, 9 May 2012 14:48:36 +0200 Subject: [PATCH 01/18] Translated using Weblate. --- po/tr.po | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/po/tr.po b/po/tr.po index 02e6e9eb62..d8b5c6d538 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-04 06:54+0200\n" +"PO-Revision-Date: 2012-05-09 14:48+0200\n" "Last-Translator: Burak Yavuz \n" "Language-Team: turkish \n" "Language: tr\n" @@ -3046,24 +3046,21 @@ msgstr "Herhangi bir türün geometri nesneleri topluluğu" #: libraries/Types.class.php:619 libraries/Types.class.php:971 msgctxt "numeric types" msgid "Numeric" -msgstr "" +msgstr "Sayısal" #: libraries/Types.class.php:638 libraries/Types.class.php:974 -#, fuzzy #| msgid "Both date and time." msgctxt "date and time types" msgid "Date and time" -msgstr "Her iki tarih ve saat de." +msgstr "Tarih ve saat" #: libraries/Types.class.php:647 libraries/Types.class.php:977 -#, fuzzy #| msgid "Linestring" msgctxt "string types" msgid "String" -msgstr "Satır dizgisi" +msgstr "Dizgi" #: libraries/Types.class.php:668 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" @@ -7344,7 +7341,7 @@ msgstr "ESRI Şekil Dosyası" #: libraries/import/shp.php:199 #, php-format msgid "Geometry type '%s' is not supported by MySQL." -msgstr "" +msgstr "Geometri türü '%s' MySQL tarafından desteklenmiyor." #: libraries/import/shp.php:360 #, php-format From 0ad76991ebe0036a128b14c7bffe022a751df6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 May 2012 21:01:50 +0200 Subject: [PATCH 02/18] Translated using Weblate. --- po/cs.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/cs.po b/po/cs.po index 2412585b4f..e3fdd129b5 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-05-09 13:14+0200\n" -"PO-Revision-Date: 2012-05-09 13:01+0200\n" +"PO-Revision-Date: 2012-05-09 13:27+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: czech \n" "Language: cs\n" @@ -2961,7 +2961,7 @@ msgstr "" #: libraries/Types.class.php:349 msgid "A single value chosen from a set of up to 64 members" -msgstr "" +msgstr "Jedna hodnota vybraná z množiny až 64 možností" #: libraries/Types.class.php:351 msgid "A type that can store a geometry of any type" @@ -2996,32 +2996,28 @@ msgid "A collection of geometry objects of any type" msgstr "" #: libraries/Types.class.php:619 libraries/Types.class.php:971 -#, fuzzy #| msgid "Numeric" msgctxt "numeric types" msgid "Numeric" msgstr "Čísla" #: libraries/Types.class.php:638 libraries/Types.class.php:974 -#, fuzzy #| msgid "Date and time" msgctxt "date and time types" msgid "Date and time" msgstr "Datum a čas" #: libraries/Types.class.php:647 libraries/Types.class.php:977 -#, fuzzy #| msgid "String" msgctxt "string types" msgid "String" msgstr "Řetězce" #: libraries/Types.class.php:668 -#, fuzzy #| msgid "Spatial" msgctxt "spatial types" msgid "Spatial" -msgstr "Prostorový" +msgstr "Prostorové" #: libraries/Types.class.php:703 msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647" @@ -3043,7 +3039,7 @@ msgstr "True nebo false" #: libraries/Types.class.php:713 msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE" -msgstr "" +msgstr "Zkratka pro BIGINT NOT NULL AUTO_INCREMENT UNIQUE" #: libraries/Types.class.php:715 msgid "Stores a Universally Unique Identifier (UUID)" From 9bb935be22139e6cb399353bb1e2dc5d035daf14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 09:51:15 +0200 Subject: [PATCH 03/18] Use type classifiers instead of going through array --- libraries/rte/rte_routines.lib.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/rte/rte_routines.lib.php b/libraries/rte/rte_routines.lib.php index f6b324ed39..07e10e87f9 100644 --- a/libraries/rte/rte_routines.lib.php +++ b/libraries/rte/rte_routines.lib.php @@ -987,7 +987,6 @@ function PMA_RTN_getQueryFromRequest() global $_REQUEST, $errors, $param_sqldataaccess, $param_directions; $_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : ''; - $column_types = $GLOBALS['PMA_Types']->getColumns(); $query = 'CREATE '; if (! empty($_REQUEST['item_definer'])) { @@ -1053,12 +1052,12 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_param_opts_text'][$i])) { - if (in_array($_REQUEST['item_param_type'][$i], $column_types['STRING'])) { + if ($GLOBALS['PMA_Types']->getTypeClass($_REQUEST['item_param_type'][$i]) == 'CHAR') { $params .= ' CHARSET ' . strtolower($_REQUEST['item_param_opts_text'][$i]); } } if (! empty($_REQUEST['item_param_opts_num'][$i])) { - if (in_array($_REQUEST['item_param_type'][$i], $column_types['NUMERIC'])) { + if ($GLOBALS['PMA_Types']->getTypeClass($_REQUEST['item_param_type'][$i]) == 'NUMBER') { $params .= ' ' . strtoupper($_REQUEST['item_param_opts_num'][$i]); } } @@ -1093,12 +1092,12 @@ function PMA_RTN_getQueryFromRequest() } } if (! empty($_REQUEST['item_returnopts_text'])) { - if (in_array($_REQUEST['item_returntype'], $column_types['STRING'])) { + if ($GLOBALS['PMA_Types']->getTypeClass($_REQUEST['item_returntype']) == 'CHAR') { $query .= ' CHARSET ' . strtolower($_REQUEST['item_returnopts_text']); } } if (! empty($_REQUEST['item_returnopts_num'])) { - if (in_array($_REQUEST['item_returntype'], $column_types['NUMERIC'])) { + if ($GLOBALS['PMA_Types']->getTypeClass($_REQUEST['item_returntype']) == 'NUMBER') { $query .= ' ' . strtoupper($_REQUEST['item_returnopts_num']); } } From ff45b824cdaf45e80fdf9c20771504c7daf56ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 09:55:48 +0200 Subject: [PATCH 04/18] Treat ENUM/SET as character types as same functions can be applied to them and need charset --- libraries/Types.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/Types.class.php b/libraries/Types.class.php index 4f3ba320c9..ec14814dc5 100644 --- a/libraries/Types.class.php +++ b/libraries/Types.class.php @@ -413,11 +413,9 @@ class PMA_Types_MySQL extends PMA_Types case 'MEDIUMBLOB': case 'BLOB': case 'LONGBLOB': - return 'CHAR'; - case 'ENUM': case 'SET': - return ''; + return 'CHAR'; case 'GEOMETRY': case 'POINT': @@ -766,13 +764,11 @@ class PMA_Types_Drizzle extends PMA_Types case 'TEXT': case 'VARBINARY': case 'BLOB': + case 'ENUM': return 'CHAR'; case 'UUID': return 'UUID'; - - case 'ENUM': - return ''; } return ''; } From b56a0a727b862de7224202fc4c260593b64820ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:06:30 +0200 Subject: [PATCH 05/18] It is enough to check for existence here --- libraries/common.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 142f7d8673..f789012a36 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3723,9 +3723,7 @@ function PMA_getFunctionsForField($field, $insert_mode) $functions = $GLOBALS['PMA_Types']->getAllFunctions(); $cnt_functions = count($functions); for ($j = 0; $j < $cnt_functions; $j++) { - if (! isset($dropdown_built[$functions[$j]]) - || $dropdown_built[$functions[$j]] != 'true' - ) { + if (! isset($dropdown_built[$functions[$j]])) { // Is current function defined as default? $selected = ($field['first_timestamp'] && $functions[$j] == $cfg['DefaultFunctions']['first_timestamp']) || (! $field['first_timestamp'] && $functions[$j] == $default_function) From 843fe3dced5814d423eb42894638c1d5b9abd650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:06:54 +0200 Subject: [PATCH 06/18] Store boolean rather than string --- libraries/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f789012a36..8d82192cc9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3714,7 +3714,7 @@ function PMA_getFunctionsForField($field, $insert_mode) $retval .= ' selected="selected"'; } $retval .= '>' . $each_dropdown . '' . "\n"; - $dropdown_built[$each_dropdown] = 'true'; + $dropdown_built[$each_dropdown] = true; $op_spacing_needed = true; } // For compatibility's sake, do not let out all other functions. Instead From 2dabdb8ea3d4b25b283f8188715365e0df6b9e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:08:19 +0200 Subject: [PATCH 07/18] Move spacer creating outside of loop --- libraries/common.lib.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 8d82192cc9..0584f3d64d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3717,6 +3717,13 @@ function PMA_getFunctionsForField($field, $insert_mode) $dropdown_built[$each_dropdown] = true; $op_spacing_needed = true; } + + // Create separator before all functions list + if ($op_spacing_needed) { + $retval .= ' '; + $retval .= '' . "\n"; + } + // For compatibility's sake, do not let out all other functions. Instead // print a separator (blank) and then show ALL functions which weren't // shown yet. @@ -3729,11 +3736,6 @@ function PMA_getFunctionsForField($field, $insert_mode) || (! $field['first_timestamp'] && $functions[$j] == $default_function) ? ' selected="selected"' : ''; - if ($op_spacing_needed == true) { - $retval .= ' '; - $retval .= '' . "\n"; - $op_spacing_needed = false; - } $retval .= ' '; $retval .= '' . $functions[$j] From e2e3de0392aa25afe811439ff4d34230b5f4ff56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:09:07 +0200 Subject: [PATCH 08/18] Do not build indentation, it is anyway wrong in most places --- libraries/common.lib.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0584f3d64d..49dff998e7 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3704,11 +3704,10 @@ function PMA_getFunctionsForField($field, $insert_mode) } // Create the output - $retval = ' ' . "\n"; + $retval = '' . "\n"; // loop on the dropdown array and print all available options for that // field. foreach ($dropdown as $each_dropdown) { - $retval .= ' '; $retval .= '' . $functions[$j] . '' . "\n"; } From 9fd0edb33c3e847bbc404ad8b7f5748ebb07451b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:10:47 +0200 Subject: [PATCH 09/18] Less local variables --- libraries/common.lib.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 49dff998e7..7d66ddb63c 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3661,11 +3661,8 @@ function PMA_getFunctionsForField($field, $insert_mode) global $cfg, $analyzed_sql, $data; $selected = ''; - $dropdown = array(); $default_function = ''; - $dropdown = $GLOBALS['PMA_Types']->getFunctions($field['True_Type']); - // Can we get field class based values? $current_class = $GLOBALS['PMA_Types']->getTypeClass($field['True_Type']); if (! empty($current_class)) { @@ -3707,13 +3704,14 @@ function PMA_getFunctionsForField($field, $insert_mode) $retval = '' . "\n"; // loop on the dropdown array and print all available options for that // field. - foreach ($dropdown as $each_dropdown) { + $functions = $GLOBALS['PMA_Types']->getFunctions($field['True_Type']); + foreach ($functions as $function) { $retval .= '' . "\n"; - $dropdown_built[$each_dropdown] = true; + $retval .= '>' . $function . '' . "\n"; + $dropdown_built[$function] = true; $op_spacing_needed = true; } From 0dc00ba80418e9df63597ebb657e28ad818f182d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:11:39 +0200 Subject: [PATCH 10/18] No need to store this explicitely, we already have this information --- libraries/common.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7d66ddb63c..0167d14704 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3671,7 +3671,6 @@ function PMA_getFunctionsForField($field, $insert_mode) } } $dropdown_built = array(); - $op_spacing_needed = false; // what function defined as default? // for the first timestamp we don't set the default function // if there is a default value for the timestamp @@ -3712,11 +3711,10 @@ function PMA_getFunctionsForField($field, $insert_mode) } $retval .= '>' . $function . '' . "\n"; $dropdown_built[$function] = true; - $op_spacing_needed = true; } // Create separator before all functions list - if ($op_spacing_needed) { + if (count($functions) > 0) { $retval .= '' . "\n"; } From a413124f7597e3d1e75f7d5d8e372c8e52c65026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:12:47 +0200 Subject: [PATCH 11/18] Should be defined on top --- libraries/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0167d14704..4f50e63d3e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3662,6 +3662,7 @@ function PMA_getFunctionsForField($field, $insert_mode) $selected = ''; $default_function = ''; + $dropdown_built = array(); // Can we get field class based values? $current_class = $GLOBALS['PMA_Types']->getTypeClass($field['True_Type']); @@ -3670,7 +3671,6 @@ function PMA_getFunctionsForField($field, $insert_mode) $default_function = $cfg['DefaultFunctions']['FUNC_' . $current_class]; } } - $dropdown_built = array(); // what function defined as default? // for the first timestamp we don't set the default function // if there is a default value for the timestamp From 3da2dbb851dd7226f7080528cfda94c5a5f5620e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:14:56 +0200 Subject: [PATCH 12/18] One place to set default function --- libraries/common.lib.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 4f50e63d3e..026d552d6d 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3685,6 +3685,10 @@ function PMA_getFunctionsForField($field, $insert_mode) ) { $default_function = $cfg['DefaultFunctions']['first_timestamp']; } + // Default for first timestamp field + if ($field['first_timestamp']) { + $default_function = $cfg['DefaultFunctions']['first_timestamp']; + } // For primary keys of type char(36) or varchar(36) UUID if the default // function // Only applies to insert mode, as it would silently trash data on updates. @@ -3726,8 +3730,7 @@ function PMA_getFunctionsForField($field, $insert_mode) for ($j = 0; $j < $cnt_functions; $j++) { if (! isset($dropdown_built[$functions[$j]])) { // Is current function defined as default? - $selected = ($field['first_timestamp'] && $functions[$j] == $cfg['DefaultFunctions']['first_timestamp']) - || (! $field['first_timestamp'] && $functions[$j] == $default_function) + $selected = ($functions[$j] == $default_function) ? ' selected="selected"' : ''; From e65cf5228c421ebbfd9f72981d82243c568759a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:16:08 +0200 Subject: [PATCH 13/18] Use foreach loop instead of indexing array all the time --- libraries/common.lib.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 026d552d6d..494c68b7b4 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3726,17 +3726,15 @@ function PMA_getFunctionsForField($field, $insert_mode) // print a separator (blank) and then show ALL functions which weren't // shown yet. $functions = $GLOBALS['PMA_Types']->getAllFunctions(); - $cnt_functions = count($functions); - for ($j = 0; $j < $cnt_functions; $j++) { - if (! isset($dropdown_built[$functions[$j]])) { - // Is current function defined as default? - $selected = ($functions[$j] == $default_function) - ? ' selected="selected"' - : ''; - - $retval .= '' . $functions[$j] - . '' . "\n"; + foreach ($functions as $function) { + if (isset($dropdown_built[$function])) { + continue; } + $retval .= '' . "\n"; } // end for return $retval; From 1e7f79fd3fdea9f6b713cc833a24a424ea0f04e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:19:05 +0200 Subject: [PATCH 14/18] Docblock --- libraries/common.lib.php | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 494c68b7b4..d07de78f80 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3727,6 +3727,7 @@ function PMA_getFunctionsForField($field, $insert_mode) // shown yet. $functions = $GLOBALS['PMA_Types']->getAllFunctions(); foreach ($functions as $function) { + // Skip already included functions if (isset($dropdown_built[$function])) { continue; } From 60c5f0e7bc3029c2e9ea9bede183d5bb1c3fe24e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:22:10 +0200 Subject: [PATCH 15/18] Factor out getting default function for field --- libraries/common.lib.php | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index d07de78f80..ac39e748b3 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3642,7 +3642,7 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false } /** - * Creates a dropdown box with MySQL functions for a particular column. + * Returns default function for a particular column. * * @param array $field Data about the column for which * to generate the dropdown @@ -3656,13 +3656,11 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false * @return string An HTML snippet of a dropdown list with function * names appropriate for the requested column. */ -function PMA_getFunctionsForField($field, $insert_mode) +function PMA_geDefaulttFunctionForField($field, $insert_mode) { global $cfg, $analyzed_sql, $data; - $selected = ''; $default_function = ''; - $dropdown_built = array(); // Can we get field class based values? $current_class = $GLOBALS['PMA_Types']->getTypeClass($field['True_Type']); @@ -3703,6 +3701,25 @@ function PMA_getFunctionsForField($field, $insert_mode) $default_function = 'UNHEX'; } + return $default_function; +} + +/** + * Creates a dropdown box with MySQL functions for a particular column. + * + * @param array $field Data about the column for which + * to generate the dropdown + * @param bool $insert_mode Whether the operation is 'insert' + * + * @return string An HTML snippet of a dropdown list with function + * names appropriate for the requested column. + */ +function PMA_getFunctionsForField($field, $insert_mode) +{ + $selected = ''; + $default_function = PMA_geDefaulttFunctionForField($field, $insert_mode); + $dropdown_built = array(); + // Create the output $retval = '' . "\n"; // loop on the dropdown array and print all available options for that From c9ebb0bdc2bb8863a68b94134f082e3db2e45c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:22:24 +0200 Subject: [PATCH 16/18] Remove unused variable --- libraries/common.lib.php | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ac39e748b3..dd9f49a828 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3716,7 +3716,6 @@ function PMA_geDefaulttFunctionForField($field, $insert_mode) */ function PMA_getFunctionsForField($field, $insert_mode) { - $selected = ''; $default_function = PMA_geDefaulttFunctionForField($field, $insert_mode); $dropdown_built = array(); From 05c0f9bf87c18e550ac01f82a9e958c1ff35fca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 10 May 2012 10:24:38 +0200 Subject: [PATCH 17/18] Separator should be disabled --- libraries/common.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index dd9f49a828..7ec5207570 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3735,7 +3735,7 @@ function PMA_getFunctionsForField($field, $insert_mode) // Create separator before all functions list if (count($functions) > 0) { - $retval .= '' . "\n"; + $retval .= '' . "\n"; } // For compatibility's sake, do not let out all other functions. Instead From 6bb1b8c76e4ca0c64d90b6f623f7ac8654cfed18 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Thu, 10 May 2012 11:55:38 +0200 Subject: [PATCH 18/18] fix typo in function name --- libraries/common.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7ec5207570..dd6baab842 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3656,7 +3656,7 @@ function PMA_getGISFunctions($geom_type = null, $binary = true, $display = false * @return string An HTML snippet of a dropdown list with function * names appropriate for the requested column. */ -function PMA_geDefaulttFunctionForField($field, $insert_mode) +function PMA_getDefaultFunctionForField($field, $insert_mode) { global $cfg, $analyzed_sql, $data; @@ -3716,7 +3716,7 @@ function PMA_geDefaulttFunctionForField($field, $insert_mode) */ function PMA_getFunctionsForField($field, $insert_mode) { - $default_function = PMA_geDefaulttFunctionForField($field, $insert_mode); + $default_function = PMA_getDefaultFunctionForField($field, $insert_mode); $dropdown_built = array(); // Create the output