typo fixes

This commit is contained in:
Robin Johnson
2003-03-14 10:15:21 +00:00
parent 886332d614
commit 30c81059d5
4 changed files with 14 additions and 8 deletions

View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-03-14 Robin Johnson <robbat2@users.sourceforge.net>
* 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 <rabus@users.sourceforge.net> 2003-03-13 Alexander M. Turek <rabus@users.sourceforge.net>
* server_status.php3: Fixed the Garvin's calculations. * server_status.php3: Fixed the Garvin's calculations.
* server_variables.php3: Fixed the display for MySQL <= 4.0.3-beta. * server_variables.php3: Fixed the display for MySQL <= 4.0.3-beta.

View File

@@ -555,7 +555,7 @@ if ($cfg['ShowFunctionFields']) {
); );
// Which column types will be mapped to which Group? // Which column types will be mapped to which Group?
$cfg['RestricColumnTypes'] = array( $cfg['RestrictColumnTypes'] = array(
'VARCHAR' => 'FUNC_CHAR', 'VARCHAR' => 'FUNC_CHAR',
'TINYINT' => 'FUNC_NUMBER', 'TINYINT' => 'FUNC_NUMBER',
'TEXT' => 'FUNC_CHAR', 'TEXT' => 'FUNC_CHAR',
@@ -584,7 +584,7 @@ if ($cfg['ShowFunctionFields']) {
); );
// Map above defined groups to any function // Map above defined groups to any function
$cfg['RestricFunctions'] = array( $cfg['RestrictFunctions'] = array(
'FUNC_CHAR' => array( 'FUNC_CHAR' => array(
'ASCII', 'ASCII',
'CHAR', 'CHAR',

View File

@@ -971,7 +971,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
} }
// Which column types will be mapped to which Group? // Which column types will be mapped to which Group?
$cfg['RestricColumnTypes'] = array( $cfg['RestrictColumnTypes'] = array(
'VARCHAR' => 'FUNC_CHAR', 'VARCHAR' => 'FUNC_CHAR',
'TINYINT' => 'FUNC_NUMBER', 'TINYINT' => 'FUNC_NUMBER',
'TEXT' => 'FUNC_CHAR', 'TEXT' => 'FUNC_CHAR',
@@ -1000,7 +1000,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
); );
// Map above defined groups to any function // Map above defined groups to any function
$cfg['RestricFunctions'] = array( $cfg['RestrictFunctions'] = array(
'FUNC_CHAR' => array( 'FUNC_CHAR' => array(
'ASCII', 'ASCII',
'CHAR', 'CHAR',

View File

@@ -335,11 +335,11 @@ for ($i = 0; $i < $fields_cnt; $i++) {
echo "\n"; echo "\n";
$selected = ''; $selected = '';
// garvin: Find the current type in the RestricColumnTypes. Will result in 'FUNC_CHAR' // garvin: Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
// or something similar. Then directly look up the entry in the RestricFunctions array, // or something similar. Then directly look up the entry in the RestrictFunctions array,
// which will then reveal the available dropdown options // 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'])]])) { 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['RestricFunctions'][$cfg['RestricColumnTypes'][strtoupper($row_table_def['True_Type'])]]; $dropdown = $cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($row_table_def['True_Type'])]];
} else { } else {
$dropdown = array(); $dropdown = array();
} }