Merge branch 'master' of /var/www/trunk

[quix0rs-gnu-social.git] / actions / favorited.php

diff --git a/actions/favorited.php b/actions/favorited.php
index 0223564f34e754fbdc27eba4bea23d723b3d29ce..4155b3a234d22f036f16a77220ed71ea4b982cae 100644 (file)
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -181,10 +181,9 @@ class FavoritedAction extends Action
             $qry .= ' LIMIT ' . $offset . ', ' . $limit;
         }
 
-        // XXX: Figure out how to cache this query
-
-        $notice = new Notice;
-        $notice->query(sprintf($qry, common_config('popular', 'dropoff')));
+        $notice = Memcached_DataObject::cachedQuery('Notice',
+                                                    sprintf($qry, common_config('popular', 'dropoff')),
+                                                    600);
 
         $nl = new NoticeList($notice, $this);