Changeset 27304

Timestamp:

02/26/2014 11:57:10 PM (12 years ago)

Author:

nacin

Message:

Add a $default argument to get_query_var() and WP_Query::get(). fixes #16471.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (2 diffs)
• tests/phpunit/tests/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -19 +19 @@
  * @uses $wp_query
  *
- * @param string $var The variable key to retrieve.
+ * @param string $var       The variable key to retrieve.
+ * @param mixed  $default   Value to return if the query variable is not set. Default ''.
  * @return mixed
  */
-function get_query_var($var) {
+function get_query_var( $var, $default = '' ) {
         global $wp_query;
 
-        return $wp_query->get($var);
+        return $wp_query->get( $var, $default );
 }
 
@@ -2131 +2132 @@
          *
          * @param string $query_var Query variable key.
+         * @param mixed  $default   Value to return if the query variable is not set. Default ''.
          * @return mixed
          */
-        function get($query_var) {
-                if ( isset($this->query_vars[$query_var]) )
-                        return $this->query_vars[$query_var];
-
-                return '';
+        function get( $query_var, $default = '' ) {
+                if ( isset( $this->query_vars[ $query_var ] ) ) {
+                        return $this->query_vars[ $query_var ];
+                }
+
+                return $default;
         }
 

trunk/tests/phpunit/tests/query.php

@@ -78 +78 @@
                 }
         }
+
+        /**
+         * @ticket 16471
+         */
+        function test_default_query_var() {
+                $query = new WP_Query;
+                $this->assertEquals( '', $query->get( 'nonexistent' ) );
+                $this->assertFalse( $query->get( 'nonexistent', false ) );
+                $this->assertTrue( $query->get( 'nonexistent', true ) );
+        }
 }