diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-07-31 08:33:49 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-07-31 08:33:49 +0200 |
commit | 8b34075755bcf104964079f9ffe8f0550869e1f0 (patch) | |
tree | 8c695e621821ad229c390c9a7fad8555ee288474 /program/include/rcube_config.php | |
parent | ec78f98c6a4152c328a9bcf9dd59397df653d81d (diff) | |
parent | cb190c0cf331c7cf2dd6e3aeb007a1e5b1bad65c (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Conflicts:
program/include/rcube_spellchecker.php
Diffstat (limited to 'program/include/rcube_config.php')
-rw-r--r-- | program/include/rcube_config.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index a0e914b78..aae3656a1 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -252,6 +252,11 @@ class rcube_config $prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0); } + // larry is the new default skin :-) + if ($prefs['skin'] == 'default') { + $prefs['skin'] = 'larry'; + } + $this->userprefs = $prefs; $this->prop = array_merge($this->prop, $prefs); |