Plugin Directory

Changeset 603548

Timestamp:
09/25/2012 10:36:37 AM (12 years ago)
Author:
daniloercoli
Message:

jetpack: merge mobile push notifications branch into trunk.

Location:
jetpack/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • jetpack/trunk/jetpack.php

    r603223 r603548  
    192192        add_action( 'jetpack_clean_nonces', array( $this, 'clean_nonces' ) );
    193193
     194
     195
    194196        add_action( 'admin_menu', array( $this, 'admin_menu' ) );
    195197        add_action( 'admin_init', array( $this, 'admin_init' ) );
     
    25882590        return $methods;
    25892591    }
     2592
     2593
     2594
     2595
     2596
     2597
     2598
     2599
     2600
     2601
     2602
     2603
     2604
     2605
     2606
    25902607
    25912608    function clean_nonces( $all = false ) {
  • jetpack/trunk/modules/subscriptions.php

    r588185 r603548  
    128128        }
    129129
    130         if ( 1 == $comment->comment_approved ) {
    131             $this->jetpack->sync->comment( $id );
    132         }
     130        if ( 'spam' === $comment->comment_approved ) {
     131            return;
     132        }
     133       
     134        $this->jetpack->sync->comment( $id );
    133135    }
    134136
Note: See TracChangeset for help on using the changeset viewer.