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

[quix0rs-gnu-social.git] / lib / profileaction.php

diff --git a/lib/profileaction.php b/lib/profileaction.php
index d9c1ea29f9723cfc2adcdcc9b9d360379bddf35d..59682d5505e76bf84d967f5cdf2a7c1cec88ce28 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -97,8 +97,8 @@ class ProfileAction extends OwnerDesignAction
         $this->showSubscriptions();
         $this->showSubscribers();
         $this->showGroups();
-        $this->showPeopletagSubs();
-        $this->showPeopletags();
+        $this->showListsFor();
+        $this->showListSubscriptions();
         $this->showStatistics();
     }
 
@@ -180,29 +180,25 @@ class ProfileAction extends OwnerDesignAction
         $this->elementEnd('div');
     }
 
-    function showPeopletagSubs()
+    function showListsFor()
     {
-        $user = common_current_user();
-        if (!empty($user) && $this->profile->id == $user->id) {
-            if (Event::handle('StartShowPeopletagSubscriptionsSection', array($this))) {
+        if (Event::handle('StartShowListsForSection', array($this))) {
 
-                $profile = $user->getProfile();
-                $section = new PeopletagSubscriptionsSection($this, $profile);
-                $section->show();
+            $section = new PeopletagsForUserSection($this, $this->profile);
+            $section->show();
 
-                Event::handle('EndShowPeopletagSubscriptionsSection', array($this));
-            }
+            Event::handle('EndShowListsForSection', array($this));
         }
     }
 
-    function showPeopletags()
+    function showListSubscriptions()
     {
-        if (Event::handle('StartShowPeopletagsSection', array($this))) {
+        if (Event::handle('StartShowListSubscriptionsSection', array($this))) {
 
-            $section = new PeopletagsForUserSection($this, $this->profile);
+            $section = new PeopletagSubscriptionsSection($this, $this->profile);
             $section->show();
 
-            Event::handle('EndShowPeopletagsSection', array($this));
+            Event::handle('EndShowListSubscriptionsSection', array($this));
         }
     }