summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-11-25 17:45:38 +0100
committerThomas Bruederli <thomas@roundcube.net>2012-11-25 17:45:38 +0100
commitfdbe5a88049ae708abaf5247db96cf8e9f95f51e (patch)
tree7f31217ab0dfe03aedc1c2aeec7b6fa3d664f5fa
parente2e2e8f37901eac134b133776f247658f2d33963 (diff)
Separate framework and application constants
-rw-r--r--program/include/iniset.php4
-rw-r--r--program/lib/Roundcube/bootstrap.php5
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__).'/');