Changeset 8b34075 in github

Timestamp:

Jul 31, 2012 2:33:49 AM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

ec86add

Parents:

ec78f98 (diff), cb190c0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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

Conflicts:

program/include/rcube_spellchecker.php

Location:

program/include

Files:

• rcube_config.php (modified) (1 diff)
• rcube_spellchecker.php (modified) (1 diff)

program/include/rcube_config.php

@@ -253 +253 @@
         }
 
+        // larry is the new default skin :-)
+        if ($prefs['skin'] == 'default') {
+            $prefs['skin'] = 'larry';
+        }
+
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);

program/include/rcube_spellchecker.php

@@ -229 +229 @@
                 $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);