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

Set $walk_dirs = true for post rewrite rule generation. Fixes #21020 for 3.4. 

Partial revert of r19737 and r19778 as some users were relying on this behaviour.
Bump database version to force flushing of rewrite rules upon upgrade.


git-svn-id: http://core.svn.wordpress.org/branches/3.4@21115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
duck_ 2012-06-25 20:51:16 +00:00
parent fbd8f0c492
commit 9f844ee12c
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/canonical.php
View File

@ -100,7 +100,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
}
if ( ! $redirect_url ) {
if ( $redirect_url = redirect_guess_404_permalink( $requested_url ) ) {
if ( $redirect_url = redirect_guess_404_permalink() ) {
$redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
}
}
@ -461,31 +461,16 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur
}
/**
* Attempts to guess the correct URL from the current URL (that produced a 404) or
* the current query variables.
* Attempts to guess the correct URL based on query vars
*
* @since 2.3.0
* @uses $wpdb
*
* @param string $current_url Optional. The URL that has 404'd.
* @return bool|string The correct URL if one is found. False on failure.
*/
function redirect_guess_404_permalink( $current_url = '' ) {
function redirect_guess_404_permalink() {
global $wpdb, $wp_rewrite;
if ( ! empty( $current_url ) )
$parsed_url = @parse_url( $current_url );
// Attempt to redirect bare category slugs if the permalink structure starts
// with the %category% tag.
if ( isset( $parsed_url['path'] )
&& preg_match( '#^[^%]+%category%#', $wp_rewrite->permalink_structure )
&& $cat = get_category_by_path( $parsed_url['path'] )
) {
if ( ! is_wp_error( $cat ) )
return get_term_link( $cat );
}
if ( get_query_var('name') ) {
$where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');

2
wp-includes/rewrite.php
View File

@ -1537,7 +1537,7 @@ class WP_Rewrite {
$registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
// Post
$post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false, true, false, false );
$post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false );
$post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
// Date

2
wp-includes/version.php
View File

@ -11,7 +11,7 @@ $wp_version = '3.4.1-alpha-21096';
*
* @global int $wp_db_version
*/
$wp_db_version = 20596;
$wp_db_version = 21115;
/**
* Holds the TinyMCE version