Changeset 762486

Timestamp:

08/26/2013 02:57:46 PM (11 years ago)

Author:

tmoorewp

Message:

Revert 761460. Need to find a different way to do this so we don't break other modules (Notifications in this case).

File:

• jetpack/trunk/modules/subscriptions.php (modified) (4 diffs)

jetpack/trunk/modules/subscriptions.php

@@ -74 +74 @@
         add_action( 'comment_form', array( $this, 'comment_subscribe_init' ) );
 
-        // Catch comment posts or approvals; check for subscriptions.
-        add_action( 'comment_post',                   array( $this, 'comment_subscribe_submit' ),        50, 2 );
-        add_action( 'comment_unapproved_to_approved', array( $this, 'comment_subscribe_on_transition' ), 50, 2 );
+        // Catch comment posts and check for subscriptions.
+        add_action( 'comment_post', array( $this, 'comment_subscribe_submit' ), 50, 2 );
     }
 
@@ -464 +463 @@
 
     /**
-    * Jetpack_Subscriptions::comment_subscribe_submit()
-    *
-    * When a user checks the comment subscribe box and submits a comment, subscribe them to the comment thread.
-    */
-    function comment_subscribe_submit( $comment_id, $approved ) {
-        if ( 1 !== $approved || 'approve' !== $approved ) { // if the comment is not approved, spam, or held, do not sync it
+    it()
+    *
+    * When a user checks the comment subscribe box and submits a comment, subscribe them to the comment thread.
+    */
+    function comment_subscribe_submit( $comment_id, $approved ) {
+        if ( 
             return;
         }
@@ -476 +475 @@
         $this->set_cookies( isset( $_REQUEST['subscribe_comments'] ), isset( $_REQUEST['subscribe_blog'] ) );
 
-        if ( !isset( $_REQUEST['subscribe_comments'] ) && !isset( $_REQUEST['subscribe_blog'] ) )
+       if ( !isset( $_REQUEST['subscribe_comments'] ) && !isset( $_REQUEST['subscribe_blog'] ) )
             return;
 
@@ -489 +488 @@
 
         Jetpack_Subscriptions::subscribe( $comment->comment_author_email, $post_ids );
-    }
-
-    function comment_subscribe_on_transition( $comment_id, $comment ) {
-        if ( ! is_object( $comment ) )
-            return;
-            
-        Jetpack_Subscriptions::comment_subscribe_submit( (int) $comment_id, $comment->comment_approved );
-    }
+     }
 
     /**