From 30c81059d53f2cc38a94b4586a63c33d8b297603 Mon Sep 17 00:00:00 2001 From: Robin Johnson Date: Fri, 14 Mar 2003 10:15:21 +0000 Subject: [PATCH] typo fixes --- ChangeLog | 6 ++++++ config.inc.php3 | 4 ++-- libraries/config_import.lib.php3 | 4 ++-- tbl_change.php3 | 8 ++++---- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa74db75c..3a4e26883 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-03-14 Robin Johnson + * config.inc.php3, libraries/config_import.lib.php3 tbl_change.php3: + - Typo fixes: + s/RestricColumnTypes/RestrictColumnTypes/ + s/RestricFunctions/RestrictFunctions/ + 2003-03-13 Alexander M. Turek * server_status.php3: Fixed the Garvin's calculations. * server_variables.php3: Fixed the display for MySQL <= 4.0.3-beta. diff --git a/config.inc.php3 b/config.inc.php3 index d7ad68d2f..a10d99829 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -555,7 +555,7 @@ if ($cfg['ShowFunctionFields']) { ); // Which column types will be mapped to which Group? - $cfg['RestricColumnTypes'] = array( + $cfg['RestrictColumnTypes'] = array( 'VARCHAR' => 'FUNC_CHAR', 'TINYINT' => 'FUNC_NUMBER', 'TEXT' => 'FUNC_CHAR', @@ -584,7 +584,7 @@ if ($cfg['ShowFunctionFields']) { ); // Map above defined groups to any function - $cfg['RestricFunctions'] = array( + $cfg['RestrictFunctions'] = array( 'FUNC_CHAR' => array( 'ASCII', 'CHAR', diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index ac1c25aed..c4b8fc4d4 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -971,7 +971,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { } // Which column types will be mapped to which Group? - $cfg['RestricColumnTypes'] = array( + $cfg['RestrictColumnTypes'] = array( 'VARCHAR' => 'FUNC_CHAR', 'TINYINT' => 'FUNC_NUMBER', 'TEXT' => 'FUNC_CHAR', @@ -1000,7 +1000,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { ); // Map above defined groups to any function - $cfg['RestricFunctions'] = array( + $cfg['RestrictFunctions'] = array( 'FUNC_CHAR' => array( 'ASCII', 'CHAR', diff --git a/tbl_change.php3 b/tbl_change.php3 index 887fa347d..2d1d8c9d7 100755 --- a/tbl_change.php3 +++ b/tbl_change.php3 @@ -335,11 +335,11 @@ for ($i = 0; $i < $fields_cnt; $i++) { echo "\n"; $selected = ''; - // garvin: Find the current type in the RestricColumnTypes. Will result in 'FUNC_CHAR' - // or something similar. Then directly look up the entry in the RestricFunctions array, + // garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR' + // or something similar. Then directly look up the entry in the RestrictFunctions array, // which will then reveal the available dropdown options - if (isset($cfg['RestricFunctions']) && isset($cfg['RestricColumnTypes']) && isset($cfg['RestricColumnTypes'][strtoupper($row_table_def['True_Type'])]) && isset($cfg['RestricFunctions'][$cfg['RestricColumnTypes'][strtoupper($row_table_def['True_Type'])]])) { - $dropdown = $cfg['RestricFunctions'][$cfg['RestricColumnTypes'][strtoupper($row_table_def['True_Type'])]]; + if (isset($cfg['RestrictFunctions']) && isset($cfg['RestrictColumnTypes']) && isset($cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]) && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]])) { + $dropdown = $cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]]; } else { $dropdown = array(); }