fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-03-11 06:12 am

[dw-free] Remove references to nonexistent (ljcom-only) phonepost tables in code inherited from live

[commit: http://hg.dwscoalition.org/dw-free/rev/8fe47fb57746]

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

Remove references in code -- all unused.

Patch by [personal profile] fu.

Files modified:
  • bin/moveucluster.pl
  • cgi-bin/LJ/User.pm
  • cgi-bin/ljlib.pl
--------------------------------------------------------------------------------
diff -r c53761b35d31 -r 8fe47fb57746 bin/moveucluster.pl
--- a/bin/moveucluster.pl	Fri Mar 11 13:55:58 2011 +0800
+++ b/bin/moveucluster.pl	Fri Mar 11 14:11:50 2011 +0800
@@ -662,7 +662,6 @@ sub moveUser {
                "logsec2" => "log2",
                "talkprop2" => "talk2",
                "talktext2" => "talk2",
-               "phoneposttrans" => "phonepostentry", # FIXME: ljcom
                "modblob" => "modlog",
                "sessions_data" => "sessions",
                "memkeyword2" => "memorable2",
diff -r c53761b35d31 -r 8fe47fb57746 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Fri Mar 11 13:55:58 2011 +0800
+++ b/cgi-bin/LJ/User.pm	Fri Mar 11 14:11:50 2011 +0800
@@ -7709,7 +7709,7 @@ sub unset_remote
 
 # $dom: 'L' == log, 'T' == talk, 'M' == modlog, 'S' == session,
 #       'R' == memory (remembrance), 'K' == keyword id,
-#       'P' == phone post, 'C' == pending comment
+#       'C' == pending comment
 #       'V' == 'vgift', 'E' == ESN subscription id
 #       'Q' == Notification Inbox,
 #       'D' == 'moDule embed contents', 'I' == Import data block
@@ -7811,12 +7811,6 @@ sub alloc_user_counter
     } elsif ($dom eq "K") {
         $newmax = $u->selectrow_array("SELECT MAX(kwid) FROM userkeywords WHERE userid=?",
                                       undef, $uid);
-    } elsif ($dom eq "P") {
-        my $userblobmax = $u->selectrow_array("SELECT MAX(blobid) FROM userblob WHERE journalid=? AND domain=?",
-                                              undef, $uid, LJ::get_blob_domainid("phonepost"));
-        my $ppemax = $u->selectrow_array("SELECT MAX(blobid) FROM phonepostentry WHERE userid=?",
-                                         undef, $uid);
-        $newmax = ($ppemax > $userblobmax) ? $ppemax : $userblobmax;
     } elsif ($dom eq "C") {
         $newmax = $u->selectrow_array("SELECT MAX(pendid) FROM pendcomments WHERE jid=?",
                                       undef, $uid);
diff -r c53761b35d31 -r 8fe47fb57746 cgi-bin/ljlib.pl
--- a/cgi-bin/ljlib.pl	Fri Mar 11 13:55:58 2011 +0800
+++ b/cgi-bin/ljlib.pl	Fri Mar 11 14:11:50 2011 +0800
@@ -246,7 +246,6 @@ sub get_blob_domainid
     my $name = shift;
     my $id = {
         "userpic" => 1,
-        "phonepost" => 2,
     }->{$name};
     # FIXME: add hook support, so sites can't define their own
     # general code gets priority on numbers, say, 1-200, so verify
--------------------------------------------------------------------------------

Post a comment in response:

This account has disabled anonymous posting.
If you don't have an account you can create one now.
HTML doesn't work in the subject.
More info about formatting

If you are unable to use this captcha for any reason, please contact us by email at support@dreamwidth.org