Changeset 6423 for sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/class-o2-follow.php

Timestamp:

01/24/2018 07:13:02 PM (9 years ago)

Author:

obenland

Message:

O2 Follow: Avoid JS errors when following comments.

Props pento.
Fixes #2786.

File:

• sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/class-o2-follow.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/class-o2-follow.php

@@ -183 +183 @@
          */
         public function subscribe_o2_register_post_action_states() {
-                if ( ! function_exists( 'o2_register_post_action_states' ) ) {
+                if ( function_exists( 'o2_register_post_action_states' ) ) {
                         o2_register_post_action_states( 'follow', [
                                 'normal'     => [
@@ -280 +280 @@
                 }
 
-                if ( 'post-comment-subscribe' !== $_GET['action'] ) {
-                        die;
-                }
-
-                $this->subscribe_to_comments( $post_id );
+                if ( 'post-comment-subscribe' === $_GET['action'] ) {
+                        $this->subscribe_to_comments( $post_id );
+                }
+
+                // Echo success if this was an AJAX request, otherwise redirect.
+                if ( isset( $_GET['ajax'] ) ) {
+                        echo '1';
+                } else {
+                        wp_safe_redirect( get_permalink( $post_id ) );
+                }
                 die;
         }