twivatar

voitto · Jul 31, 2009 · 05de6c1 · 05de6c1
1 parent 7f0f02b
commit 05de6c1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/app/omb/plugins/wp.php b/app/omb/plugins/wp.php
@@ -1391,9 +1391,13 @@ function get_avatar( $current_user_id, $pixels ) {
   $avatar = "";
   if (!empty($the_author->avatar)) {
     $avatar = $the_author->avatar;
+    if (strpos($the_author->avatar, 'twitter_production') !== false)
+      $avatar = profile_get_avatar($the_author);
   } else {
     $p = get_profile();
-    if (!isset($the_post->id) || ($the_author->id == $p->id))
+    if (strpos($p->avatar, 'twitter_production') !== false)
+      $avatar = profile_get_avatar($p);
+    elseif (!isset($the_post->id) || ($the_author->id == $p->id))
       $avatar = $p->avatar;
   }
   if (!(is_microblog_theme()))
@@ -1402,8 +1406,6 @@ function get_avatar( $current_user_id, $pixels ) {
     <img alt=\'\' src=\''.$avatar.'\' 
     class=\'avatar avatar-48\' height=\'48\' width=\'48\' />
     ';
-  if (strpos($the_author->avatar, 'twitter_production') !== false)
-    $avatar = profile_get_avatar($the_author);
   if (!(empty($avatar)))
     return '<a href="'.$the_author->profile.'"><img alt="avatar" src="' . $avatar . '" style="width:'.$pixels.'px;height:'.$pixels.'px;" class="avatar" /></a>';
 }

diff --git a/app/omb/views/identities/_entry.html b/app/omb/views/identities/_entry.html
@@ -8,7 +8,7 @@
 $i = array(
   'url'      => $Member->url,
   'name'     => $Member->nickname,
-  'photo'    => $Member->avatar
+  'photo'    => profile_get_avatar($Member,'bigger')
 );
 
 // url, name, email, org() name/title, location() street/town/zip/state/country

diff --git a/wp-content/themes/p2/sidebar.php b/wp-content/themes/p2/sidebar.php
@@ -86,7 +86,7 @@
   <?php if (!in_array('settings',$request->activeroute->patterns)) { ?>
   <?php if (!isset($request->params['nickname'])) : ?>
 
-    <img width="32" height="32" class="profile" src="<?php echo $profile->avatar; ?>" alt="<?php echo $profile->fullname; ?>" /><a class="profile-nick" href="<?php echo $profile->profile_url; ?>"><?php echo $profile->nickname; ?></a>
+    <img width="32" height="32" class="profile" src="<?php echo profile_get_avatar($profile); ?>" alt="<?php echo $profile->fullname; ?>" /><a class="profile-nick" href="<?php echo $profile->profile_url; ?>"><?php echo $profile->nickname; ?></a>
     <br /><br />
   <?php endif; ?>