Merge branch 'master' of github.com:roundcube/roundcubemail

Conflicts:
	program/include/rcube_spellchecker.php

2 files changed, 7 insertions, 1 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);
 
diff --git a/program/include/rcube_spellchecker.php b/program/include/rcube_spellchecker.php
index b615edb96..a2d1f7c61 100644
--- a/program/include/rcube_spellchecker.php
+++ b/program/include/rcube_spellchecker.php
@@ -228,8 +228,9 @@ class rcube_spellchecker
             else if (!pspell_check($this->plink, $word)) {
                 $suggestions = pspell_suggest($this->plink, $word);
 
-                if (sizeof($suggestions) > self::MAX_SUGGESTIONS)
+                if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
                     $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+                }
 
                 $matches[] = array($word, $pos, $len, null, $suggestions);
             }