From fdbe5a88049ae708abaf5247db96cf8e9f95f51e Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sun, 25 Nov 2012 17:45:38 +0100 Subject: Separate framework and application constants --- program/include/iniset.php | 4 ++++ program/lib/Roundcube/bootstrap.php | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/program/include/iniset.php b/program/include/iniset.php index d79fbd466..0081aa021 100644 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -20,6 +20,10 @@ +-----------------------------------------------------------------------+ */ +// application constants +define('RCMAIL_VERSION', '0.9-git'); +define('RCMAIL_START', microtime(true)); + $config = array( // Some users are not using Installer, so we'll check some // critical PHP settings here. Only these, which doesn't provide diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 018701d08..e2fd2a732 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -47,10 +47,9 @@ foreach ($config as $optname => $optval) { } } -// application constants -define('RCMAIL_VERSION', '0.9-git'); +// framework constants +define('RCUBE_VERSION', '0.9-git'); define('RCMAIL_CHARSET', 'UTF-8'); -define('RCMAIL_START', microtime(true)); if (!defined('RCUBE_LIB_DIR')) { define('RCUBE_LIB_DIR', dirname(__FILE__).'/'); -- cgit v1.2.3