Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / plugins / SearchSub / SearchSub.php

diff --git a/plugins/SearchSub/SearchSub.php b/plugins/SearchSub/SearchSub.php
index b903e88e2eac85e0be06f68de9da64ed23be3af1..7e9a94caa9ef8ad79979918183f4dd9e61b3d8ea 100644 (file)
--- a/plugins/SearchSub/SearchSub.php
+++ b/plugins/SearchSub/SearchSub.php
@@ -147,18 +147,18 @@ class SearchSub extends Managed_DataObject
         $keypart = sprintf('searchsub:by_profile:%d', $profile->id);
         $searchstring = self::cacheGet($keypart);
         
-        if ($searchstring !== false && !empty($searchstring)) {
-            $searches = explode(',', $searchstring);
+        if ($searchstring !== false) {
+               if (!empty($searchstring)) {
+               $searches = explode(',', $searchstring);
+               }
         } else {
             $searchsub = new SearchSub();
             $searchsub->profile_id = $profile->id;
+            $searchsub->selectAdd();
+            $searchsub->selectAdd('search');
 
             if ($searchsub->find()) {
-                while ($searchsub->fetch()) {
-                    if (!empty($searchsub->search)) {
-                        $searches[] = $searchsub->search;
-                    }
-                }
+                $searches = $searchsub->fetchAll('search');
             }
 
             self::cacheSet($keypart, implode(',', $searches));