Merge pull request #161 from NeilWJames/master

Version 3.2.2 gives an "property of non-object" at line 1403 on load
wp-document-revisions · Apr 26, 2019 · d0436c1 · d0436c1
2 parents 24c4639 + 862146f
commit d0436c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/includes/class-wp-document-revisions.php b/includes/class-wp-document-revisions.php
@@ -1400,8 +1400,8 @@ public function verify_post_type( $documentish = false ) {
 			}
 
 			// Assume that a document feed is a document feed, even without a post object.
-			if ( is_array( $wp_query->query_vars ) && ( array_key_exists( 'post_type', $wp_query->query_vars ) ) &&
-			'document' === $wp_query->query_vars['post_type'] && is_feed() ) {
+			if ( isset( $wp_query->query_vars ) && is_array( $wp_query->query_vars ) &&
+			( array_key_exists( 'post_type', $wp_query->query_vars ) ) && 'document' === $wp_query->query_vars['post_type'] && is_feed() ) {
 				return true;
 			}
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -73,7 +73,7 @@ function _make_user( $role = 'administrator', $user_login = '', $pass = '', $ema
 			'user_email' => ( $email ) ? $email : rand_str() . '@example.com',
 		);
 
-	$user_id = wp_insert_user( $user );
+		$user_id = wp_insert_user( $user );
 
 		return $user_id;
 

diff --git a/tests/class-test-wp-document-revisions.php b/tests/class-test-wp-document-revisions.php
@@ -346,14 +346,17 @@ public function test_verify_post_type() {
 
 		$_GET['post_type'] = 'document';
 		$this->assertTrue( $wpdr->verify_post_type(), 'verify post type via explicit' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		unset( $_GET['post_type'] );
 
 		$_GET['post'] = $doc_id;
 		$this->assertTrue( $wpdr->verify_post_type(), 'verify post type via get' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		unset( $_GET['post'] );
 
 		$_REQUEST['post_id'] = $doc_id;
 		$this->assertTrue( $wpdr->verify_post_type(), 'verify post type via request (post_id)' );
+		// phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		unset( $_REQUEST['post_id'] );
 
 		// @codingStandardsIgnoreStart WordPress.Variables.GlobalVariables.OverrideProhibited