From 891f1d9e6aacf5c361c5dce27d7f5023fa02b61a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 23 Aug 2010 10:14:35 +0000 Subject: [PATCH] Remove obsolete code, fixed timezone on some machines: - Removed obsolete code which avoids endless redirect and dublicate filter-chain call - Added to load ext-timezone (badly hardcoded) to have timezone set on some servers - TODOs.txt updated --- DOCS/TODOs.txt | 1 - inc/install-inc.php | 9 +++++++++ inc/mysql-connect.php | 9 --------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 21a0837eb8..9b949e3456 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -4,7 +4,6 @@ ./beg.php:165: // @TODO Opps, what is missing here??? ./birthday_confirm.php:95: // @TODO Try to rewrite the following unset() ./inc/autopurge/purge-inact.php:57: // @TODO Rewrite these if() blocks to a filter -./inc/cache/config-local.php:126:// @TODO Rewrite the following three constants, somehow... ./inc/classes/cachesystem.class.php:474: // @TODO Add support for more types which break in last else-block ./inc/config-functions.php:141: // @TODO Make this all better... :-/ ./inc/expression-functions.php:166:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again diff --git a/inc/install-inc.php b/inc/install-inc.php index c65b742c04..5b3337251a 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -46,6 +46,15 @@ if (!defined('__SECURITY')) { die(); } // END - if +// Load extension timezone +loadExtension('timezone', 'test'); + +// Set config entry +setConfigEntry('timezone', 'Europe/Berlin'); + +// And init timezone +FILTER_INIT_TIMEZONE(); + // Init variables $GLOBALS['install_mysql'] = array(); if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) { diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php index 959ccfd682..076faa56f2 100644 --- a/inc/mysql-connect.php +++ b/inc/mysql-connect.php @@ -152,15 +152,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) { // Load cache loadIncludeOnce('inc/load_cache.php'); - - // Run the init filter chain - runFilterChain('init'); - - // Are we installation routine? - if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) { - // You have to install first! - redirectToUrl('install.php'); - } // END - if } // Handle fatal errors -- 2.39.5