From fd7b853c9d7c3e9f1fda19c4f931d2d3a0672ae0 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Fri, 30 May 2003 20:12:50 +0000 Subject: [PATCH] * Removed check for default tab values: They are already checked in config_import.lib.php3; * Corrected config file revison. --- ChangeLog | 4 ++++ libraries/common.lib.php3 | 19 +++---------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc62e1ce6..ae13f6839 100755 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,10 @@ $Source$ * scripts/create-tables.sql: Added some notes about lower_case_table_names. * libraries/sqlparser.lib.php3: Parser treated "CHARACTER" as column type, even if it was used in "CHARACTER SET". + * libraries/common.lib.php3: + - Removed check for default tab values: They are already checked in + config_import.lib.php3; + - Corrected config file revison. 2003-05-29 Michal Cihar * lang/czech: Updated. diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 7982e12e8..4b78e4daa 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -138,7 +138,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} * Includes compatibility code for older config.inc.php3 revisions * if necessary */ - if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 175) { + if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 181) { include('./libraries/config_import.lib.php3'); } @@ -658,19 +658,6 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} } - /** - * Make sure $cfg['DefaultTabDatabase'] and $cfg['DefaultTabTable'] are set. - * Todo: check if it is set to a *valid* value. - */ - if (empty($cfg['DefaultTabDatabase'])) { - $cfg['DefaultTabDatabase'] = 'db_details_structure.php3'; - } - - if (empty($cfg['DefaultTabTable'])) { - $cfg['DefaultTabTable'] = 'tbl_properties_structure.php3'; - } - - /** * Use mysql_connect() or mysql_pconnect()? */ @@ -1687,8 +1674,8 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} global $PHP_SELF, $cfg; global $db_details_links_count_tabs; - if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || - $active || + if (((!isset($GLOBALS['active_page']) && basename($PHP_SELF) == $link) || + $active || (isset($GLOBALS['active_page']) && $GLOBALS['active_page'] == $link) ) && ($text != $GLOBALS['strEmpty'] && $text != $GLOBALS['strDrop'])) { $bgcolor = 'silver';