Blend in with some new code. New menus, etc.

diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index b00ccc8abbb8afde292aa05fde2ca9d27fdeda83..2bb03470d94367e5bd560fedc46683f3f01e2853 100644 (file)
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -181,7 +181,7 @@ class EditpeopletagAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new PeopletagGroupNav($this, $this->peopletag);
         $nav->show();

diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php
index 3158b715bc2c22f76480d0ac7bf3528c37a4e705..e0e0ccc57db30632211ccccee8f14adf79428afe 100644 (file)
--- a/actions/peopletagsbyuser.php
+++ b/actions/peopletagsbyuser.php
@@ -181,11 +181,6 @@ class PeopletagsbyuserAction extends OwnerDesignAction
         $this->elementEnd('dd');
         $this->elementEnd('dl');
     }
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
 
     function showAnonymousMessage()
     {

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index b6875b300ba8dda6fe72f1a3c995f5cae8977752..73fb2256128437cc3a7dbabef30a1b94456eb3ea 100644 (file)
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -95,12 +95,6 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showAnonymousMessage()
     {
         $notice =

diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index b45651d1a2e0002f575902e5d99cfd9b7d8bc8a8..90f232e774244f6fc31cf9dc32c8befe86fbad6c 100644 (file)
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -95,12 +95,6 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showAnonymousMessage()
     {
         $notice =

diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php
index a4cace6e961b65d5dcd1f62d317387b9ed6b663e..d9f9e9c12e5ade8e5a5f7acbeeddfce9417331db 100644 (file)
--- a/actions/showprofiletag.php
+++ b/actions/showprofiletag.php
@@ -179,7 +179,7 @@ class ShowprofiletagAction extends Action
         );
     }
 
-    function showLocalNav()
+    function showObjectNav()
     {
         $nav = new PeopletagGroupNav($this);
         $nav->show();

diff --git a/classes/Notice.php b/classes/Notice.php
index 79b034e76f9bb9055b5365f630b241c29758d03d..bd47b8b8c372cf23e7f6f992a9bef3dd76789349 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -871,38 +871,39 @@ class Notice extends Memcached_DataObject
                 }
             }
 
-        foreach ($ptags as $ptag) {
-            $users = $ptag->getUserSubscribers();
-            foreach ($users as $id) {
-                if (!array_key_exists($id, $ni)) {
-                    $user = User::staticGet('id', $id);
-                    if (!$user->hasBlocked($profile)) {
-                        $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG;
+            foreach ($ptags as $ptag) {
+                $users = $ptag->getUserSubscribers();
+                foreach ($users as $id) {
+                    if (!array_key_exists($id, $ni)) {
+                        $user = User::staticGet('id', $id);
+                        if (!$user->hasBlocked($profile)) {
+                            $ni[$id] = NOTICE_INBOX_SOURCE_PROFILE_TAG;
+                        }
                     }
                 }
             }
-        }
 
-        foreach ($recipients as $recipient) {
-            if (!array_key_exists($recipient, $ni)) {
-                $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
-            }
+            foreach ($recipients as $recipient) {
+                if (!array_key_exists($recipient, $ni)) {
+                    $ni[$recipient] = NOTICE_INBOX_SOURCE_REPLY;
+                }
 
-            // Exclude any deleted, non-local, or blocking recipients.
-            $profile = $this->getProfile();
-            $originalProfile = null;
-            if ($this->repeat_of) {
-                // Check blocks against the original notice's poster as well.
-                $original = Notice::staticGet('id', $this->repeat_of);
-                if ($original) {
-                    $originalProfile = $original->getProfile();
+                // Exclude any deleted, non-local, or blocking recipients.
+                $profile = $this->getProfile();
+                $originalProfile = null;
+                if ($this->repeat_of) {
+                    // Check blocks against the original notice's poster as well.
+                    $original = Notice::staticGet('id', $this->repeat_of);
+                    if ($original) {
+                        $originalProfile = $original->getProfile();
+                    }
                 }
-            }
-            foreach ($ni as $id => $source) {
-                $user = User::staticGet('id', $id);
-                if (empty($user) || $user->hasBlocked($profile) ||
-                    ($originalProfile && $user->hasBlocked($originalProfile))) {
-                    unset($ni[$id]);
+                foreach ($ni as $id => $source) {
+                    $user = User::staticGet('id', $id);
+                    if (empty($user) || $user->hasBlocked($profile) ||
+                        ($originalProfile && $user->hasBlocked($originalProfile))) {
+                        unset($ni[$id]);
+                    }
                 }
             }