Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
	lib/profileblock.php
	theme/default/css/display.css

diff --cc EVENTS.txt
index e66e9257259032d0b2e08a7ac816040e08a68f70,08a4273ec907537471284d66f2080d3c09860220..80708ed8822a7680d52550fba463317278612d8f
--- 1/EVENTS.txt
--- 2/EVENTS.txt
+++ b/EVENTS.txt
@@@ -1297,3 -1147,19 +1297,19 @@@ StartDefaultLocalNav: When showing the 
  EndDefaultLocalNav: When showing the default local nav
  - $menu: the menu
  - $user: current user
 -- $group: the group being shown
+ 
+ StartShowAccountProfileBlock: When showing the profile block for an account
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ EndShowAccountProfileBlock: After showing the profile block for an account
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ StartShowGroupProfileBlock: When showing the profile block for a group
+ - $out: XMLOutputter to append custom output
+ - $profile: the profile being shown
+ 
+ EndShowGroupProfileBlock: After showing showing the profile block for a group
+ - $out: XMLOutputter to append custom output
++- $group: the group being shown

diff --cc classes/Notice.php
Simple merge

diff --cc classes/Profile.php
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc lib/accountprofileblock.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/profileblock.php
index 78b5dd3ec4e8b42202438039a4be96333b27f6f5,bf1ffd1443d827ee4053a702784998241760c696..3cea0474a429bfacdbfca7c1c65f04349a052714
--- 1/lib/profileblock.php
--- 2/lib/profileblock.php
+++ b/lib/profileblock.php
@@@ -56,16 -56,32 +56,33 @@@ abstract class ProfileBlock extends Wid
  
      function show()
      {
-         $this->out->elementStart('div', 'profile_block section');
+         $this->showActions();
+         $this->showAvatar();
+         $this->showName();
+         $this->showLocation();
+         $this->showHomepage();
+         $this->showDescription();
++        $this->showTags();
+     }
  
+     function showAvatar()
+     {
          $size = $this->avatarSize();
  
-         $this->out->element('img', array('src' => $this->avatar(),
-                                          'class' => 'profile_block_avatar',
-                                          'alt' => $this->name(),
-                                          'width' => $size,
-                                          'height' => $size));
+         $this->out->element(
+             'img',
+             array(
+                 'src'  => $this->avatar(),
+                 'class'  => 'ur_face',
+                 'alt'    => $this->name(),
+                 'width'  => $size,
+                 'height' => $size
+             )
+         );
+     }
  
+     function showName()
+     {
          $name = $this->name();
  
          if (!empty($name)) {

diff --cc theme/neo/css/display.css
Simple merge

diff --cc theme/rebase/css/display.css
Simple merge