[#264 state:resolved] Patch from SixApart TRAC merged into MT::CMS::A…

…sset.
openmelody · Sep 27, 2010 · 8517ae8 · 8517ae8
1 parent 6557ca1
commit 8517ae8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/MT/CMS/Asset.pm b/lib/MT/CMS/Asset.pm
@@ -306,11 +306,10 @@ sub asset_userpic {
         $asset = $app->model('asset')->lookup($id);
     }
 
-    my $thumb_html = $app->model('author')->userpic_html( Asset => $asset );
-
     my $user_id = $param->{user_id} || $q->param('user_id');
+    my $user;
     if ($user_id) {
-        my $user = $app->model('author')->load( {id => $user_id} );
+        $user = $app->model('author')->load( {id => $user_id} );
         if ($user) {
             # Delete the author's userpic thumb (if any); it'll be regenerated.
             if ($user->userpic_asset_id != $asset->id) {
@@ -325,6 +324,10 @@ sub asset_userpic {
         }
     }
 
+    my $thumb_html = $user 
+        ? $user->userpic_html( Asset => $asset ) 
+        : $app->model('author')->userpic_html( Asset => $asset ); 
+
     $app->load_tmpl(
         'dialog/asset_userpic.tmpl',
         {