Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[livejournal] r16135: LJSV-883 & LJSV-878:

Committer: ailyin
LJSV-883 & LJSV-878:

- ESN bugfixes
- add a console command to output number of subscriptions

U   trunk/cgi-bin/LJ/Event/UserExpunged.pm
U   trunk/cgi-bin/LJ/Subscription/GroupSet.pm
U   trunk/cgi-bin/LJ/User.pm
Modified: trunk/cgi-bin/LJ/Event/UserExpunged.pm
===================================================================
--- trunk/cgi-bin/LJ/Event/UserExpunged.pm	2010-01-25 11:34:42 UTC (rev 16134)
+++ trunk/cgi-bin/LJ/Event/UserExpunged.pm	2010-01-25 12:44:44 UTC (rev 16135)
@@ -97,6 +97,6 @@
 
 sub available_for_user  { 1 }
 sub is_subscription_visible_to  { 1 }
-sub is_tracking { 0 }
+sub is_tracking { 1 }
 
 1;

Modified: trunk/cgi-bin/LJ/Subscription/GroupSet.pm
===================================================================
--- trunk/cgi-bin/LJ/Subscription/GroupSet.pm	2010-01-25 11:34:42 UTC (rev 16134)
+++ trunk/cgi-bin/LJ/Subscription/GroupSet.pm	2010-01-25 12:44:44 UTC (rev 16135)
@@ -90,6 +90,7 @@
         $self->insert_sub($sub);
     }
 
+
     if ($u->{'opt_gettalkemail'} eq 'Y') {
         my @virtual_subs = (
             {
@@ -272,8 +273,6 @@
 
         LJ::update_user($u, {'opt_gettalkemail' => 'N'});
     }
-
-
 }
 
 sub update {
@@ -303,7 +302,7 @@
         next unless keys %{$group_new->{'subs'}};
 
         # ensure that the inbox method is in there
-        $group_new->ensure_inbox_created;
+        $group_new->ensure_inbox_created if $group_new->is_tracking;
 
         foreach my $ntypeid (keys %{$group_new->{'subs'}}) {
             my $sub = $group_new->{'subs'}->{$ntypeid};
@@ -329,7 +328,7 @@
 
         my $group_new = $newset->{'groups'}->{$gkey};
 
-        $group_new->ensure_inbox_created;
+        $group_new->ensure_inbox_created if $group_new->is_tracking;
 
         my %ntypeids = map { $_ => 1 } (
             keys %{$group_old->{'subs'}},

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2010-01-25 11:34:42 UTC (rev 16134)
+++ trunk/cgi-bin/LJ/User.pm	2010-01-25 12:44:44 UTC (rev 16135)
@@ -42,6 +42,8 @@
                       LJ::M::FriendsOf
                       LJ::BetaFeatures
                       LJ::S2Theme
+                      LJ::Subscription
+                      LJ::Subscription::GroupSet
                       );
 
 # class method to create a new account.

Tags: andy, livejournal, pm
Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments