- Fix dont_override setting does not override existing user preferences (#1...

alecpl

2011-02-15 bfb7d6e6819c8453d3e7c5c6d4fb261af078b176

 program/include/rcube_config.php

@@ -188,8 +188,18 @@
     */
    public function set_user_prefs($prefs)
    {
        // Honor the dont_override setting for any existing user preferences
        $dont_override = $this->get('dont_override');
        if (is_array($dont_override) && !empty($dont_override)) {
            foreach ($prefs as $key => $pref) {
                if (in_array($key, $dont_override)) {
                    unset($prefs[$key]);
                }
            }
        }

        $this->userprefs = $prefs;
        $this->prop = array_merge($this->prop, $prefs);
        $this->prop      = array_merge($this->prop, $prefs);
    }