Merge branch 'develop'

10up · Jun 1, 2016 · d6ab89a · d6ab89a
2 parents 3e1a60e + c78a571
commit d6ab89a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/classes/class-ep-sync-manager.php b/classes/class-ep-sync-manager.php
@@ -19,7 +19,7 @@ public function __construct() { }
 	 * @since  2.0
 	 * @var    array
 	 */
-	protected $sync_post_queue = array();
+	public $sync_post_queue = array();
 
 	/**
 	 * Setup actions and filters
@@ -145,7 +145,7 @@ public function action_delete_blog_from_index( $blog_id ) {
 	 */
 	public function action_delete_post( $post_id ) {
 
-		if ( ( ! current_user_can( 'edit_post', $post_id ) && ! apply_filters( 'ep_sync_delete_permissions_bypass', false, $post_ID ) ) || 'revision' === get_post_type( $post_id ) ) {
+		if ( ( ! current_user_can( 'edit_post', $post_id ) && ! apply_filters( 'ep_sync_delete_permissions_bypass', false, $post_id ) ) || 'revision' === get_post_type( $post_id ) ) {
 			return;
 		}
 

diff --git a/tests/test-single-site.php b/tests/test-single-site.php
@@ -27,6 +27,8 @@ public function setUp() {
 		ep_activate();
 
 		EP_WP_Query_Integration::factory()->setup();
+		EP_Sync_Manager::factory()->setup();
+		EP_Sync_Manager::factory()->sync_post_queue = array();
 
 		$this->setup_test_post_type();
 	}
@@ -114,7 +116,7 @@ public function testPostSync() {
 	 *
 	 * @since 2.0
 	 */
-	public function testPostSyncOnMetaAdd() {
+	public function testpoopPostSyncOnMetaAdd() {
 		add_action( 'ep_sync_on_meta_update', array( $this, 'action_sync_on_meta_update' ), 10, 0 );
 
 		$post_id = ep_create_and_sync_post();
@@ -138,7 +140,7 @@ public function testPostSyncOnMetaAdd() {
 	 *
 	 * @since 2.0
 	 */
-	public function testPostSyncOnMetaUpdate() {
+	public function testpoopPostSyncOnMetaUpdate() {
 		add_action( 'ep_sync_on_meta_update', array( $this, 'action_sync_on_meta_update' ), 10, 0 );
 
 		$post_id = ep_create_and_sync_post();