summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-12-07 11:39:36 +0000
committeralecpl <alec@alec.pl>2011-12-07 11:39:36 +0000
commita90ad2840f5a10576caf0219036ae26ed1090dcc (patch)
treecbe11643ece20d0ea1f3ac5f97c14c0c829ce757 /program/include
parentb6da0b76afb5697685c35b8584631294cfc7b12f (diff)
- Deprecate $DB, $USER, $IMAP global variables, Use $RCMAIL instead
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 9f26450a1..59ffaea89 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -159,8 +159,6 @@ class rcmail
/**
* Initial startup function
* to register session, create database and imap connections
- *
- * @todo Remove global vars $DB, $USER
*/
private function startup()
{
@@ -172,7 +170,10 @@ class rcmail
}
// connect to database
- $GLOBALS['DB'] = $this->get_dbh();
+ $this->get_dbh();
+
+ // set global object for backward compatibility
+ $GLOBALS['DB'] = $this->db;
// start session
$this->session_init();
@@ -240,6 +241,8 @@ class rcmail
{
if (is_object($user)) {
$this->user = $user;
+
+ // set global object for backward compatibility
$GLOBALS['USER'] = $this->user;
// overwrite config with user preferences
@@ -320,8 +323,8 @@ class rcmail
return $this->db;
}
-
-
+
+
/**
* Get global handle for memcache access
*