Merge branch 'people_tags_rebase' into 1.0.x

Conflicts:
	EVENTS.txt

diff --combined EVENTS.txt
index eb848bb888dcd09d41f456be1de8e41b6756f9cb,80708ed8822a7680d52550fba463317278612d8f..4614ef3da5f636289e4b411e74eeedd24b785a03
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -1116,6 -1116,156 +1116,156 @@@ EndGroupProfileElements: Start showing 
  - $action: action being executed (for output and params)
  - $group: group for the page
  
+ StartShowProfileTagContent: When showing a people tag page
+ - $action: action being executed (for output and params)
+ 
+ EndShowProfileTagContent: After showing the contents of a people tag page
+ - $action: action being executed (for output and params)
+ 
+ StartShowTaggedProfilesMiniList: at the start of mini list of tagged profiles
+ - $action: action being executed (for output and params)
+ 
+ EndShowTaggedProfilesMiniList: at the end of mini list of tagged profiles
+ - $action: action being executed (for output and params)
+ 
+ StartShowProfileTagSubscribersMiniList: at the start of mini list of people tag subscribers
+ - $action: action being executed (for output and params)
+ 
+ EndShowProfileTagSubscribersMiniList: at the end of mini list of people tag subscribers
+ - $action: action being executed (for output and params)
+ 
+ StartTagProfileAction: When starting to show profile tagging page
+ - $action: action being executed (for output and params)
+ - $profile: profile being tagged
+ 
+ EndTagProfileAction: After showing profile tagging page
+ - $action: action being executed (for output and params)
+ - $profile: profile being tagged
+ 
+ StartProfileCompletionSearch: When starting a profile search for autocompletion
+ - $action: action being executed (for output and params)
+ - &$profile: result Profile objects
+ - $search_engine: the search engine
+ 
+ EndProfileCompletionSearch: After search results for profile autocompletion have been found
+ - $action: profilec completion action
+ - &$profile: current result Profile objects
+ - $search_engine: The search engine object
+ 
+ StartShowTagProfileForm: When showing people tagging form
+ - $action: action being executed (for output and params)
+ - $profile: profile being tagged
+ 
+ EndShowTagProfileForm: After showing people tagging form
+ - $action: action being executed (for output and params)
+ - $profile: profile being tagged
+ 
+ StartSavePeopletags: When starting to save people tags
+ - $action: action being executed (for output and params)
+ - $tagstring: string input, a list of tags
+ 
+ EndSavePeopletags: After saving people tags
+ - $action: action being executed (for output and params)
+ - $tagstring: string input, a list of tags
+ 
+ StartProfiletagGetUri: when generating the Uri for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$uri: the URI
+ 
+ EndProfiletagGetUri: after generating the uri for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$uri: the URI
+ 
+ StartUserPeopletagHomeUrl: when generating the homepage url for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$url: the URL
+ 
+ EndUserPeopletagHomeUrl: after generating the homepage url for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$url: the URL
+ 
+ StartProfiletagPermalink: when generating the permalink url for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$url: the URL
+ 
+ EndProfiletagPermalink: after generating the permalink url for a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$url: the URL
+ 
+ StartTagProfile: when tagging a profile
+ - $tagger: profile tagging
+ - $tagged: profile being tagged
+ - $tag: the tag
+ 
+ EndTagProfile: after tagging a profile
+ - $newtag: the newly created Profile_tag object
+ 
+ StartUntagProfile: when deleting a people tag
+ - $ptag: the Profile_tag object being deleted
+ 
+ EndUntagProfile: after deleting a people tag
+ - $orig: a copy of the deleted Profile_tag object
+ 
+ StartSubscribePeopletag: when subscribing to a people tag
+ - $peopletag: Profile_list object being subscribed to
+ - $profile: subscriber's profile
+ 
+ EndSubscribePeopletag: after subscribing to a people tag
+ - $profile_list: the people tag, a Profile_list object: Profile_list object being subscribed to
+ - $profile: subscriber's profile
+ 
+ StartUnsubscribePeopletag: when unsubscribing to a people tag
+ - $profile_list: the people tag, a Profile_list object: Profile_list object being subscribed to
+ - $profile: subscriber's profile
+ 
+ EndUnsubscribePeopletag: after unsubscribing to a people tag
+ - $peopletag: Profile_list object being subscribed to
+ - $profile: subscriber's profile
+ 
+ StartActivityObjectFromPeopletag: while starting to create an ActivityObject from a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$object: activity object
+ 
+ EndActivityObjectFromPeopletag: after making an ActivityObject from a people tag
+ - $profile_list: the people tag, a Profile_list object
+ - &$object: activity object
+ 
+ StartPeopletagGroupNav: Showing the people tag nav menu
+ - $menu: the menu widget; use $menu->action for output
+ 
+ EndPeopletagGroupNav: after showing the people tag nav menu
+ - $menu: the menu widget; use $menu->action for output
+ 
+ StartShowPeopletagItem: when showing a people tag
+ - $widget: PeopletagListItem widget
+ 
+ EndShowPeopletagItem: after showing a people tag
+ - $widget: PeopletagListItem widget
+ 
+ StartSubscribePeopletagForm: when showing people tag subscription form
+ - $action: action being executed (for output and params)
+ - $peopletag: people tag being subscribed to
+ 
+ EndSubscribePeopletagForm: after showing the people tag subscription form
+ - $action: action being executed (for output and params)
+ - $peopletag: people tag being subscribed to
+ 
+ StartShowPeopletags: when showing a textual list of people tags
+ - $widget: PeopletagsWidget; use $widget->out for output
+ - $tagger: profile of the tagger
+ - $tagged: profile tagged
+ 
+ EndShowPeopletags: after showing a textual list of people tags
+ - $widget: PeopletagsWidget; use $widget->out for output
+ - $tagger: profile of the tagger
+ - $tagged: profile tagged
+ 
+ StartProfileListItemTags: when showing people tags in a profile list item widget
+ - $widget: ProfileListItem widget
+ 
+ EndProfileListItemTags: after showing people tags in a profile list item widget
+ - $widget: ProfileListItem widget
+ 
  StartActivityObjectOutputAtom: Called at start of Atom XML output generation for ActivityObject chunks, just inside the <activity:object>. Cancel the event to take over its output completely (you're responsible for calling the matching End event if so)
  - $obj: ActivityObject
  - $out: XMLOutputter to append custom output
@@@ -1160,26 -1310,6 +1310,27 @@@ StartShowGroupProfileBlock: When showin
  - $out: XMLOutputter to append custom output
  - $profile: the profile being shown
  
--EndShowGroupProfileBlock: After showing showing the profile block for a group
++EndShowGroupProfileBlock: After showing the profile block for a group
  - $out: XMLOutputter to append custom output
  - $group: the group being shown
 +
 +StartShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- &$children: list of children
 +
 +EndShowThreadedNoticeTail: when showing the replies etc. to a notice
 +- $nli: parent noticelistitem
 +- $notice: parent notice
 +- $children: list of children
 +
 +StartShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
 +
 +EndShowThreadedNoticeSub: when showing a reply to a notice
 +- $nli: parent noticelistitem
 +- $parent: parent notice
 +- $child: child notice
++

diff --combined lib/util.php
index e3f2555babd5eb27b1602955824ed31b6016e916,d48d4c18c59b485c6ded326c1d8493be6bda1fa8..f4c9824fd53021253ffa509e7c0890e538801544
--- 1/lib/util.php
--- 2/lib/util.php
+++ b/lib/util.php
@@@ -638,7 -638,7 +638,7 @@@ function common_linkify_mention($mentio
  
          $xs->elementStart('span', 'vcard');
          $xs->elementStart('a', $attrs);
 -        $xs->element('span', 'fn nickname', $mention['text']);
 +        $xs->element('span', 'fn nickname mention', $mention['text']);
          $xs->elementEnd('a');
          $xs->elementEnd('span');
  
@@@ -754,17 -754,19 +754,19 @@@ function common_find_mentions($text, $n
          foreach ($hmatches[1] as $hmatch) {
  
              $tag = common_canonical_tag($hmatch[0]);
- 
-             $tagged = Profile_tag::getTagged($sender->id, $tag);
- 
-             $url = common_local_url('subscriptions',
-                                     array('nickname' => $sender->nickname,
-                                           'tag' => $tag));
- 
-             $mentions[] = array('mentioned' => $tagged,
-                                 'text' => $hmatch[0],
-                                 'position' => $hmatch[1],
-                                 'url' => $url);
+             $plist = Profile_list::getByTaggerAndTag($sender->id, $tag);
+             if (!empty($plist) && !$plist->private) {
+                 $tagged = $sender->getTaggedSubscribers($tag);
+ 
+                 $url = common_local_url('showprofiletag',
+                                         array('tagger' => $sender->nickname,
+                                               'tag' => $tag));
+ 
+                 $mentions[] = array('mentioned' => $tagged,
+                                     'text' => $hmatch[0],
+                                     'position' => $hmatch[1],
+                                     'url' => $url);
+             }
          }
  
          Event::handle('EndFindMentions', array($sender, $text, &$mentions));
@@@ -1148,7 -1150,7 +1150,7 @@@ function common_group_link($sender_id, 
          $xs = new XMLStringer();
          $xs->elementStart('span', 'vcard');
          $xs->elementStart('a', $attrs);
 -        $xs->element('span', 'fn nickname', $nickname);
 +        $xs->element('span', 'fn nickname group', $nickname);
          $xs->elementEnd('a');
          $xs->elementEnd('span');
          return $xs->getString();