From fdbe5a88049ae708abaf5247db96cf8e9f95f51e Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 25 Nov 2012 11:45:38 -0500
Subject: [PATCH] Separate framework and application constants
---
program/lib/Roundcube/bootstrap.php | 5 ++---
program/include/iniset.php | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/program/include/iniset.php b/program/include/iniset.php
index d79fbd4..0081aa0 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 018701d..e2fd2a7 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -47,10 +47,9 @@
}
}
-// 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__).'/');
--
Gitblit v1.9.1