WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate query_string. Add 'request' filter to filter the array of query vars. Pass around arrays instead of query strings. fixes #2777 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-08-30 05:41:38 +00:00
parent 51005b397d
commit 42fffa9296
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wp-includes/classes.php
View File

@ -94,7 +94,9 @@ class WP {
$this->query_vars = array(); $this->query_vars = array();
if (! empty($extra_query_vars)) if ( is_array($extra_query_vars) )
$this->extra_query_vars = & $extra_query_vars;
else if (! empty($extra_query_vars))
parse_str($extra_query_vars, $this->extra_query_vars); parse_str($extra_query_vars, $this->extra_query_vars);
// Process PATH_INFO, REQUEST_URI, and 404 for permalinks. // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
@ -212,19 +214,18 @@ class WP {
$this->query_vars[$wpvar] = $_GET[$wpvar]; $this->query_vars[$wpvar] = $_GET[$wpvar];
elseif (!empty($perma_query_vars[$wpvar])) elseif (!empty($perma_query_vars[$wpvar]))
$this->query_vars[$wpvar] = $perma_query_vars[$wpvar]; $this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
else
$this->query_vars[$wpvar] = '';
} }
for ($i=0; $i<count($this->private_query_vars); $i += 1) { foreach ($this->private_query_vars as $var) {
$wpvar = $this->private_query_vars[$i]; if (isset($GLOBALS[$var]) && '' != $GLOBALS[$var] && ! isset($this->extra_query_vars[$var]) )
if (isset($this->extra_query_vars[$wpvar])) $this->query_vars[$var] = $GLOBALS[$var];
$this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];
} }
if ( isset($error) ) if ( isset($error) )
$this->query_vars['error'] = $error; $this->query_vars['error'] = $error;
$this->query_vars = apply_filters('request', $this->query_vars);
do_action('parse_request', array(&$this)); do_action('parse_request', array(&$this));
} }
@ -272,7 +273,6 @@ class WP {
function build_query_string() { function build_query_string() {
$this->query_string = ''; $this->query_string = '';
foreach (array_keys($this->query_vars) as $wpvar) { foreach (array_keys($this->query_vars) as $wpvar) {
if ( '' != $this->query_vars[$wpvar] ) { if ( '' != $this->query_vars[$wpvar] ) {
$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&'; $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
@ -280,14 +280,12 @@ class WP {
} }
} }
foreach ($this->private_query_vars as $wpvar) { // query_string filter deprecated. Use request filter instead.
if (isset($GLOBALS[$wpvar]) && '' != $GLOBALS[$wpvar] && ! isset($this->extra_query_vars[$wpvar]) ) { global $wp_filter;
$this->query_string .= (strlen($this->query_string) < 1) ? '' : '&'; if ( isset($wp_filter['query_string']) ) { // Don't bother filtering and parsing if no plugins are hooked in.
$this->query_string .= $wpvar . '=' . rawurlencode($GLOBALS[$wpvar]); $this->query_string = apply_filters('query_string', $this->query_string);
} parse_str($this->query_string, $this->query_vars);
} }
$this->query_string = apply_filters('query_string', $this->query_string);
} }
function register_globals() { function register_globals() {
@ -314,7 +312,7 @@ class WP {
function query_posts() { function query_posts() {
$this->build_query_string(); $this->build_query_string();
query_posts($this->query_string); query_posts($this->query_vars);
} }
function handle_404() { function handle_404() {