Merge branch '1.0.x' of gitorious.org:statusnet/mainline into prefillbookmark

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

diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php
index 813b8290d8fff996735d1d280a78a3017b852de5..de131c2b04f161f59e13eee161910f36e3c02384 100644 (file)
--- a/plugins/SearchSub/SearchSubPlugin.php
+++ b/plugins/SearchSub/SearchSubPlugin.php
@@ -242,39 +242,6 @@ class SearchSubPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Add a count of mirrored feeds into a user's profile sidebar stats.
-     *
-     * @param Profile $profile
-     * @param array $stats
-     * @return boolean hook return value
-     */
-    function onProfileStats($profile, &$stats)
-    {
-        $cur = common_current_user();
-        if (!empty($cur) && $cur->id == $profile->id) {
-            $searchsub = new SearchSub();
-            $searchsub ->profile_id = $profile->id;
-            $entry = array(
-                'id' => 'searchsubs',
-                'label' => _m('Search subscriptions'),
-                'link' => common_local_url('searchsubs', array('nickname' => $profile->nickname)),
-                'value' => $searchsub->count(),
-            );
-
-            $insertAt = count($stats);
-            foreach ($stats as $i => $row) {
-                if ($row['id'] == 'groups') {
-                    // Slip us in after them.
-                    $insertAt = $i + 1;
-                    break;
-                }
-            }
-            array_splice($stats, $insertAt, 0, array($entry));
-        }
-        return true;
-    }
-
     /**
      * Replace the built-in stub track commands with ones that control
      * search subscriptions.
@@ -324,11 +291,13 @@ class SearchSubPlugin extends Plugin
     {
         $user = common_current_user();
 
-        $searches = SearchSub::forProfile($user->getProfile());
+        if (!empty($user)) {
+            $searches = SearchSub::forProfile($user->getProfile());
 
-        if (!empty($searches) && count($searches) > 0) {
-            $searchSubMenu = new SearchSubMenu($menu->out, $user, $searches);
-            $menu->submenu(_m('Searches'), $searchSubMenu);
+            if (!empty($searches) && count($searches) > 0) {
+                $searchSubMenu = new SearchSubMenu($menu->out, $user, $searches);
+                $menu->submenu(_m('Searches'), $searchSubMenu);
+            }
         }
 
         return true;