[dw-free] Add Pinboard, Plurk, and Tumblr to "other services" section of profile

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/95ccb4a55838]

http://bugs.dwscoalition.org/show_bug.cgi?id=4249

Merge the list of props to be preloaded, and the list of props to be saved.
This makes both lists fully consistent, and reduces duplication (less chance
for errors to be introduced). Added: opt_whatemailshow which was only in the
"save" list before. Removed country, state, city, sidx_loc, timezone from
the preload list, because these are handled by the Location widget.

Patch by fu.

Files modified:

• htdocs/manage/profile/index.bml

--------------------------------------------------------------------------------
diff -r 801369e4169a -r 95ccb4a55838 htdocs/manage/profile/index.bml
--- a/htdocs/manage/profile/index.bml	Mon Jan 30 19:48:40 2012 +0800
+++ b/htdocs/manage/profile/index.bml	Mon Jan 30 20:18:46 2012 +0800
@@ -49,21 +49,24 @@
     my $dbr = LJ::get_db_reader();
     my $sth;
 
+    # list the userprops that are handled explicitly by code on this page
+    # props in this list will be preloaded on page load and saved on post
+    my @uprops = qw/
+        opt_whatemailshow comm_theme
+        aolim google_talk icq jabber
+        msn skype yahoo tumblr
+        plurk twitter delicious diigo
+        pinboard last_fm_user
+        etsy ravelry url urlname gender
+        opt_hidefriendofs opt_hidememberofs
+        sidx_bdate sidx_bday
+        opt_showmutualfriends
+        opt_showbday opt_showlocation opt_showljtalk
+        opt_sharebday opt_showonlinestatus
+    /;
+
     # load user props
-    $u->preload_props( { use_master => 1 },
-        qw/ country state city timezone
-          aolim google_talk icq jabber
-          msn skype yahoo tumblr
-          plurk twitter delicious diigo
-          pinboard last_fm_user
-          etsy ravelry url urlname gender
-          opt_hidefriendofs opt_hidememberofs
-          sidx_bdate sidx_bday sidx_loc
-          opt_showmutualfriends
-          opt_showbday opt_showlocation
-          opt_sharebday
-          comm_theme opt_showljtalk opt_showonlinestatus/
-    );
+    $u->preload_props( { use_master => 1 }, @uprops );
 
     # to store values before they undergo normalisation
     my %saved = ();
@@ -689,20 +692,6 @@
                 }
             }
 
-            my @uprops = qw(
-              opt_whatemailshow comm_theme
-              aolim google_talk icq jabber
-              msn skype yahoo tumblr
-              plurk twitter delicious diigo
-              pinboard last_fm_user
-              etsy ravelry url urlname gender
-              opt_hidefriendofs opt_hidememberofs
-              sidx_bdate sidx_bday
-              opt_showmutualfriends
-              opt_showbday opt_showlocation opt_showljtalk
-              opt_sharebday opt_showonlinestatus
-            );
-
             # set userprops
             my %prop;
             foreach my $uprop (@uprops) {
--------------------------------------------------------------------------------