[mms] Fix harmless PHP undefined error when using with an IMAP server…

… that supports XOAUTH2.
horde · Oct 17, 2013 · a40a2fd · a40a2fd
1 parent 7359104
commit a40a2fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -194,7 +194,8 @@ public function getParam($key)
     {
         switch ($key) {
         case 'xoauth2_token':
-            if ($this->_params[$key] instanceof Horde_Imap_Client_Base_Password) {
+            if (isset($this->_params[$key]) &&
+                ($this->_params[$key] instanceof Horde_Imap_Client_Base_Password)) {
                 return $this->_params[$key]->getPassword();
             }
             break;

diff --git 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 harmless PHP undefined error when using with an IMAP server that supports XOAUTH2.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2047,7 +2047,7 @@
    <date>2013-10-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix harmless PHP undefined error when using with an IMAP server that supports XOAUTH2.
    </notes>
   </release>
  </changelog>