From 5bc1233de808442f8d412bf4394fda05b22f41d2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 26 Jul 2012 07:35:30 -0400
Subject: [PATCH] Use the same hard-coded fields for vlv-based autocompletion as in steps/mail/autocomplete.inc
---
program/include/rcube.php | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube.php b/program/include/rcube.php
index cfad77c..a39eab1 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -18,9 +18,6 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
@@ -109,12 +106,14 @@
/**
* This implements the 'singleton' design pattern
*
+ * @param integer Options to initialize with this instance. See rcube::INIT_WITH_* constants
* @return rcube The one and only instance
*/
- static function get_instance()
+ static function get_instance($mode = 0)
{
if (!self::$instance) {
self::$instance = new rcube();
+ self::$instance->init($mode);
}
return self::$instance;
@@ -243,8 +242,7 @@
*/
public function get_cache($name, $type='db', $ttl=0, $packed=true)
{
- if (!isset($this->caches[$name])) {
- $userid = $this->get_user_id();
+ if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
$this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
}
@@ -411,6 +409,7 @@
ini_set('session.use_cookies', 1);
ini_set('session.use_only_cookies', 1);
ini_set('session.serialize_handler', 'php');
+ ini_set('session.cookie_httponly', 1);
// use database for storing session data
$this->session = new rcube_session($this->get_dbh(), $this->config);
--
Gitblit v1.9.1