Do not tokenize search string when querying in strict mode (#1490504)

Thomas Bruederli

2015-09-14 db390a27fbab2e753bd17ed11cdc3be9d84612f7

 program/lib/Roundcube/rcube_user.php

@@ -1,6 +1,6 @@
<?php

/*
/**
 +-----------------------------------------------------------------------+
 | This file is part of the Roundcube Webmail client                     |
 | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
@@ -195,8 +195,9 @@

        // don't save prefs with default values if they haven't been changed yet
        foreach ($a_user_prefs as $key => $value) {
            if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key))))
            if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key)))) {
                unset($save_prefs[$key]);
            }
        }

        $save_prefs = serialize($save_prefs);
@@ -217,7 +218,7 @@
            $this->data['preferences'] = $save_prefs;

            if (!$no_session) {
                $config->set_user_prefs($a_user_prefs);
                $config->set_user_prefs($this->prefs);

                if (isset($_SESSION['preferences'])) {
                    $this->rc->session->remove('preferences');
@@ -235,7 +236,7 @@
        ) {
            $_SESSION['preferences'] = $save_prefs;
            $_SESSION['preferences_time'] = time();
            $config->set_user_prefs($a_user_prefs);
            $config->set_user_prefs($this->prefs);
            $this->data['preferences'] = $save_prefs;
        }