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

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";
         }