Revert "[mms] Don't clone objects when returning data from the struct…

…ure object." This reverts commit e3e7fcd. This is not correct, since we want the data stored in the cache to be pristine. See Bug #13700
horde · Nov 18, 2014 · af0d2fe · af0d2fe
1 parent 0ffc4bc
commit af0d2fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch.php b/framework/Imap_Client/lib/Horde/Imap/Client/Data/Fetch.php
@@ -75,7 +75,7 @@ public function setStructure(Horde_Mime_Part $structure)
     public function getStructure()
     {
         return isset($this->_data[Horde_Imap_Client::FETCH_STRUCTURE])
-            ? $this->_data[Horde_Imap_Client::FETCH_STRUCTURE]
+            ? clone $this->_data[Horde_Imap_Client::FETCH_STRUCTURE]
             : new Horde_Mime_Part();
     }
 
@@ -275,7 +275,7 @@ public function setEnvelope($data)
     public function getEnvelope()
     {
         return isset($this->_data[Horde_Imap_Client::FETCH_ENVELOPE])
-            ? $this->_data[Horde_Imap_Client::FETCH_ENVELOPE]
+            ? clone $this->_data[Horde_Imap_Client::FETCH_ENVELOPE]
             : new Horde_Imap_Client_Data_Envelope();
     }
 
@@ -322,7 +322,7 @@ public function setImapDate($date)
     public function getImapDate()
     {
         return isset($this->_data[Horde_Imap_Client::FETCH_IMAPDATE])
-            ? $this->_data[Horde_Imap_Client::FETCH_IMAPDATE]
+            ? clone $this->_data[Horde_Imap_Client::FETCH_IMAPDATE]
             : new Horde_Imap_Client_DateTime();
     }
 
@@ -550,7 +550,7 @@ protected function _getHeaders($id, $format, $key)
             if (!isset($this->_data[$key][$id])) {
                 return new Horde_Mime_Headers();
             } elseif (is_object($this->_data[$key][$id])) {
-                return $this->_data[$key][$id];
+                return clone $this->_data[$key][$id];
             }
             return Horde_Mime_Headers::parseHeaders($this->_getHeaders($id, self::HEADER_STREAM, $key));
         }

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,7 +21,6 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* [mms] Don&apos;t clone objects when returning data from the structure object.
 * [mms] Better error handling when IMAP connection is prematurely disconnected.
 * [mms] Fix regression in listMailboxes() for POP3 servers when &apos;flat&apos; option is true.
  </notes>
@@ -2757,7 +2756,6 @@
    <date>2014-11-10</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* [mms] Don&apos;t clone objects when returning data from the structure object.
 * [mms] Better error handling when IMAP connection is prematurely disconnected.
 * [mms] Fix regression in listMailboxes() for POP3 servers when &apos;flat&apos; option is true.
    </notes>