Initial checkin of Poll plugin: micro-app to post mini polls/surveys from the notice...

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

diff --git a/lib/userprofile.php b/lib/userprofile.php
index 444bb081218c9e3bd6a42e4e6f94301568b68d35..9c563db5d068f7a831832a56cd8eab18c26e0a21 100644 (file)
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -95,6 +95,8 @@ class UserProfile extends Widget
 
     function showAvatar()
     {
+        $this->out->elementStart('div', 'ur_face');
+
         if (Event::handle('StartProfilePageAvatar', array($this->out, $this->profile))) {
 
             $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -119,6 +121,8 @@ class UserProfile extends Widget
             Event::handle('EndProfilePageAvatar',
                           array($this->out, $this->profile));
         }
+
+        $this->out->elementEnd('div');
     }
 
     function showNickname()
@@ -192,15 +196,7 @@ class UserProfile extends Widget
             $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
 
             if (count($tags) > 0) {
-<<<<<<< HEAD
                 $this->out->elementStart('ul', 'tags xoxo entity_tags');
-=======
-                $this->out->elementStart('dl', 'entity_tags');
-                // TRANS: DT for tags in a profile.
-                $this->out->element('dt', null, _('Tags'));
-                $this->out->elementStart('dd');
-                $this->out->elementStart('ul', 'tags xoxo');
->>>>>>> 0.9.x
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
                     // Avoid space by using raw output.