Merge branch '1.0.x' into activity

diff --git a/classes/Notice.php b/classes/Notice.php
index e029880f8d2c6900ced425878479c26ceef3258c..f7daf708e8eb27438e0011031b72df1ea81af860 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2641,7 +2641,8 @@ class Notice extends Managed_DataObject
             }
         }
         foreach ($notices as $notice) {
-            $notice->_setFaves($faveMap[$notice->id]);
+               $faves = $faveMap[$notice->id];
+            $notice->_setFaves(&$faves);
         }
     }
 
@@ -2681,7 +2682,8 @@ class Notice extends Managed_DataObject
         $ids = self::_idsOf($notices);
         $repeatMap = Memcached_DataObject::listGet('Notice', 'repeat_of', $ids);
         foreach ($notices as $notice) {
-            $notice->_setRepeats($repeatMap[$notice->id]);
+               $repeats = $repeatMap[$notice->id];
+            $notice->_setRepeats(&$repeats);
         }
     }
 }