[livejournal] r21693: LJSUP-11581: Change LJ::load_user_props(...

LJSUP-11581: Change LJ::load_user_props() implementation to use LJ::load_user_props_multi()

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

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2012-04-11 11:13:39 UTC (rev 21692)
+++ trunk/cgi-bin/LJ/User.pm	2012-04-11 11:30:36 UTC (rev 21693)
@@ -6773,6 +6773,8 @@
     $use_master = $memcache_available || $use_master;
     my $memc_expire = time() + 3600 * 24;
 
+    LJ::User->init_userprop_def;
+
     foreach my $handler (keys %$groups) {
         my %propkeys = map { $_ => $LJ::USERPROP_DEF{$_} || '' } @{ $groups->{$handler} };
 
@@ -6832,7 +6834,7 @@
                     { 'use_master' => $use_master }
                 );
 
-                _extend_user_object($users->{$userid}, { %$propkeys, %$propmap });
+                _extend_user_object($users->{$userid}, { %propkeys, %$propmap });
 
                 my $packed = LJ::User::PropStorage->pack_for_memcache($propmap);
                 LJ::MemCache::set([$userid, $v], $packed, $memc_expire);