[livejournal] r20428: LJSV-1876: Problem with userpics on frie...

U   trunk/cgi-bin/LJ/Entry.pm

Modified: trunk/cgi-bin/LJ/Entry.pm
===================================================================
--- trunk/cgi-bin/LJ/Entry.pm	2011-10-25 10:35:01 UTC (rev 20427)
+++ trunk/cgi-bin/LJ/Entry.pm	2011-10-25 13:11:15 UTC (rev 20428)
@@ -1506,7 +1506,6 @@
     #   optional hashref to put return value in.  (see get_logtext2multi docs)
     # returns: that hashref.
     my ($idsbyc, $type, $ret) = @_;
-
     my $opts = {};
     if ($type eq 'text') {
         $opts->{text_only} = 1;
@@ -1689,6 +1688,7 @@
             my $db = shift;
             return unless %$cneedprop;
             my $in = $make_in->(keys %$cneedprop);
+
             $sth = $db->prepare("SELECT journalid, jitemid, propid, value ".
                                 "FROM logprop2 WHERE $in");
             $sth->execute;
@@ -1764,7 +1764,10 @@
         }
     }
 
-    convert_href_props( $ret->{'prop'} );
+    for my $key ( keys %{$ret->{'prop'}} ) {
+        convert_href_props( $ret->{'prop'}->{$key} );
+    }
+
     return $ret;
 }