From 1d0667951835d1e70912b8e5773e7df79631e9ad Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Wed, 26 Feb 2014 23:58:14 +0000 Subject: [PATCH] Add a $default argument to get_query_var() and WP_Query::get(). fixes #16471. Built from https://develop.svn.wordpress.org/trunk@27304 git-svn-id: http://core.svn.wordpress.org/trunk@27157 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index cf60255c1e..eed431d96e 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -18,13 +18,14 @@ * @since 1.5.0 * @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 ); } /** @@ -2130,13 +2131,15 @@ class WP_Query { * @access public * * @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]; + function get( $query_var, $default = '' ) { + if ( isset( $this->query_vars[ $query_var ] ) ) { + return $this->query_vars[ $query_var ]; + } - return ''; + return $default; } /**