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

Don't skip sanitization if 404. Add wp_title display filters. 

git-svn-id: http://svn.automattic.com/wordpress/branches/2.2@6036 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-09-05 03:13:16 +00:00
parent c845b0a1d8
commit 5528dd0af1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/default-filters.php
View File

@ -129,6 +129,8 @@ add_filter('get_the_excerpt', 'wp_trim_excerpt');
add_filter('sanitize_title', 'sanitize_title_with_dashes');
add_filter('wp_title', 'wp_specialchars');
// RSS filters
add_filter('the_title_rss', 'strip_tags');
add_filter('the_title_rss', 'ent2ncr', 8);

15
wp-includes/query.php
View File

@ -413,18 +413,8 @@ class WP_Query {
$this->query_vars = $this->fill_query_vars($this->query_vars);
$qv = &$this->query_vars;
if ( ! empty($qv['robots']) ) {
if ( ! empty($qv['robots']) )
$this->is_robots = true;
return;
}
if ('404' == $qv['error']) {
$this->is_404 = true;
if ( !empty($query) ) {
do_action_ref_array('parse_query', array(&$this));
}
return;
}
$qv['p'] = (int) $qv['p'];
$qv['page_id'] = (int) $qv['page_id'];
@ -618,6 +608,9 @@ class WP_Query {
$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
// Done correcting is_* for page_on_front and page_for_posts
if ('404' == $qv['error'])
$this->set_404();
if ( !empty($query) )
do_action_ref_array('parse_query', array(&$this));
}