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

Aleksander Machniak

2012-07-31 8b34075755bcf104964079f9ffe8f0550869e1f0

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

Conflicts:
	program/include/rcube_spellchecker.php

 program/include/rcube_config.php

@@ -252,6 +252,11 @@
            $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);


 program/include/rcube_spellchecker.php

@@ -228,8 +228,9 @@
            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);
            }