Changeset 17068

Timestamp:

12/19/2010 09:17:52 PM (16 years ago)

Author:

nacin

Message:

Don't fatal error when conditional tags are called before init. fixes #14729.

File:

• trunk/wp-includes/query.php (modified) (26 diffs)

trunk/wp-includes/query.php

@@ -145 +145 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -166 +166 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -186 +186 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -210 +210 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -234 +234 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -258 +258 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -287 +287 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -307 +307 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -327 +327 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -347 +347 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -368 +368 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -388 +388 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -418 +418 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -447 +447 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -467 +467 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -494 +494 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -514 +514 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -534 +534 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -554 +554 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -574 +574 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -603 +603 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -630 +630 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -650 +650 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -670 +670 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -690 +690 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }
 
@@ -710 +710 @@
         if ( ! isset( $wp_query ) ) {
                 _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the init hook. They always return false.' ), '3.1' );
-                // return false;
+                return false;
         }