summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-05-28 15:52:30 +0200
committerAleksander Machniak <alec@alec.pl>2014-05-28 15:52:30 +0200
commit731d190fecb1976d845f6bd18768ee528b007232 (patch)
tree323c63555256ad7e5faa6a9d3c10f957295d0ce1 /program/lib
parent586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff)
parent8763170d224408bb01998d0a3393d2eacfc781ad (diff)
Merge branch 'tinymce4'
Conflicts: program/js/app.js program/js/editor.js program/js/tiny_mce/tiny_mce.js program/steps/utils/spell_html.inc
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_spellchecker.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php
index e9a36072d..43bab08c4 100644
--- a/program/lib/Roundcube/rcube_spellchecker.php
+++ b/program/lib/Roundcube/rcube_spellchecker.php
@@ -226,7 +226,18 @@ class rcube_spellchecker
else {
$word = mb_substr($this->content, $item[1], $item[2], RCUBE_CHARSET);
}
- $result[$word] = is_array($item[4]) ? implode("\t", $item[4]) : $item[4];
+
+ if (is_array($item[4])) {
+ $suggestions = $item[4];
+ }
+ else if (empty($item[4])) {
+ $suggestions = array();
+ }
+ else {
+ $suggestions = explode("\t", $item[4]);
+ }
+
+ $result[$word] = $suggestions;
}
return $result;