Changeset 26951 for branches/3.8

Timestamp:

01/15/2014 08:16:26 AM (11 years ago)

Author:

nacin

Message:

Avoid a fatal error in wp_reset_postdata() if $wp_query global is not set.

Merges [25932] to the 3.9 branch.

props SergeyBiryukov.
fixes #26775.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• src/wp-includes/query.php (modified) (1 diff)

branches/3.8/src/wp-includes/query.php

@@ -116 +116 @@
 function wp_reset_postdata() {
     global $wp_query;
-    $wp_query->reset_postdata();
+
+    if ( isset( $wp_query ) ) {
+        $wp_query->reset_postdata();
+    }
 }