summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-25 08:58:23 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-25 08:58:23 +0200
commit2b3a3b1407bf2f6a7019f921a177d99506e3b76c (patch)
treed8ebe415bef86c4448de220ce9c60a0fe80fc25f /program/lib/Roundcube
parent855c85377d44943ba307d083632c6c5a9f1c98ad (diff)
parent093a3d9e7df58e2bd41db2caf6a348bf60c9ec8a (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube')
-rw-r--r--program/lib/Roundcube/rcube_config.php2
-rw-r--r--program/lib/Roundcube/rcube_spellchecker.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index 913eacb05..18055f77d 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -194,7 +194,7 @@ class rcube_config
*/
public function get($name, $def = null)
{
- if (array_key_exists($name, $this->prop)) {
+ if (isset($this->prop[$name])) {
$result = $this->prop[$name];
}
else {
diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php
index 60aec500f..bd6cb6759 100644
--- a/program/lib/Roundcube/rcube_spellchecker.php
+++ b/program/lib/Roundcube/rcube_spellchecker.php
@@ -377,7 +377,7 @@ class rcube_spellchecker
if (!$store) {
$this->error = "Empty result from spelling engine";
}
- else if (preg_match('/<spellresult error="([^"]+)"/', $store, $m)) {
+ else if (preg_match('/<spellresult error="((?!0")[^"]+)"/', $store, $m)) {
$this->error = "Error code $m[1] returned";
}