From a9cbbae0c8c6b8246897ce5d470e22f026774455 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Mon, 30 Jul 2012 14:36:51 +0200 Subject: [PATCH 1/2] Override default skin value read from user prefs --- program/include/rcube_config.php | 5 +++++ 1 file changed, 5 insertions(+) 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); From cb190c0cf331c7cf2dd6e3aeb007a1e5b1bad65c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 30 Jul 2012 18:22:48 +0200 Subject: [PATCH 2/2] CS fixes --- program/include/rcube_spellchecker.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/program/include/rcube_spellchecker.php b/program/include/rcube_spellchecker.php index f38720bc8..18641eca8 100644 --- a/program/include/rcube_spellchecker.php +++ b/program/include/rcube_spellchecker.php @@ -235,8 +235,9 @@ class rcube_spellchecker else if (!pspell_check($this->plink, $word)) { $suggestions = pspell_suggest($this->plink, $word); - if (sizeof($suggestions) > self::MAX_SUGGESTIONS) - $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS); + if (sizeof($suggestions) > self::MAX_SUGGESTIONS) { + $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS); + } $matches[] = array($word, $pos, $len, null, $suggestions); }