From 533cba5003815896981438c24feffe94347ed78c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@horde.org>
Date: Wed, 6 Aug 2014 12:06:51 -0600
Subject: [PATCH] [mms] Fix regression in reporting capabilities (Bug #13421).

---
 .../Imap_Client/lib/Horde/Imap/Client/Data/Capability.php   | 6 +++---
 framework/Imap_Client/package.xml                           | 4 ++--
 .../test/Horde/Imap/Client/Data/CapabilityTest.php          | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Data/Capability.php b/framework/Imap_Client/lib/Horde/Imap/Client/Data/Capability.php
index b4e04cb6897..1211a3bc0c2 100644
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Data/Capability.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Data/Capability.php
@@ -116,9 +116,9 @@ public function query($capability, $parameter = null)
             return false;
         }
 
-        return (is_null($parameter) || !is_array($this->_data[$capability]))
-            ? true
-            : in_array(strtoupper($parameter), $this->_data[$capability]);
+        return is_null($parameter) ?:
+               (is_array($this->_data[$capability]) &&
+                in_array(strtoupper($parameter), $this->_data[$capability]));
     }
 
     /**
diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
index 29005f7598d..d70d2b0ba78 100644
--- a/framework/Imap_Client/package.xml
+++ b/framework/Imap_Client/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix regression in reporting capabilities (Bug #13421).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2578,7 +2578,7 @@
    <date>2014-08-04</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix regression in reporting capabilities (Bug #13421).
    </notes>
   </release>
  </changelog>
diff --git a/framework/Imap_Client/test/Horde/Imap/Client/Data/CapabilityTest.php b/framework/Imap_Client/test/Horde/Imap/Client/Data/CapabilityTest.php
index bd1104ebab9..b6fcf6f817c 100644
--- a/framework/Imap_Client/test/Horde/Imap/Client/Data/CapabilityTest.php
+++ b/framework/Imap_Client/test/Horde/Imap/Client/Data/CapabilityTest.php
@@ -35,6 +35,7 @@ public function testQuery()
         $this->assertTrue($c->query('foo'));
 
         $this->assertFalse($c->query('BAR'));
+        $this->assertFalse($c->query('FOO', 'BAR'));
 
         $c->add('bar');