From 2787fbe5b6f015b5ce7c86185cc6876ec892b483 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 24 Jun 2013 21:13:49 +0200
Subject: Revert change where NULL config value wasn't handled as unset
 (#1489202)

---
 program/lib/Roundcube/rcube_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/lib/Roundcube')

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 {
-- 
cgit v1.2.3


From 093a3d9e7df58e2bd41db2caf6a348bf60c9ec8a Mon Sep 17 00:00:00 2001
From: Victor Benincasa <vbenincasa@gmail.com>
Date: Tue, 25 Jun 2013 03:39:23 -0300
Subject: Fix improper error checking

Currently all (HTML/TEXT) spell checking logs an error (due commit b15cc7d) and HTML spell checking doesn't work (due commit cfe2fc8). Fix: ignore error="0" value from the returned XML as it isn't an error.
---
 program/lib/Roundcube/rcube_spellchecker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/lib/Roundcube')

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";
         }
 
-- 
cgit v1.2.3