Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

QTS: fix conflict pages/posts in filter_request #1168

Merged
merged 4 commits into from
May 20, 2022
Merged

QTS: fix conflict pages/posts in filter_request #1168

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
58593e1
QTS: fix conflict pages/posts in filter_request
spleen1981 May 15, 2022
3e954f6
QTS: add comments for filter_request
spleen1981 May 16, 2022
e747c3d
QTS: fix /%category%/%postname%/ filter_request queries
spleen1981 May 16, 2022
192f2d3
QTS: fix extra rewrite rules to handle utf8 chars
spleen1981 May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 42 additions & 19 deletions modules/slugs/includes/class-qtranslate-slug.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,15 @@ function filter_request( $query ) {
global $q_config;
global $wp;

if ( isset( $query['error'] ) && isset( $wp->matched_query ) ) {
unset( $query['error'] );
/* As $wp->matched_query filters the query including slugs mudule custom rewrite rules, it provides all necessary data to reach the intended resource.
* However discarding completely $query arg and using only $wp->matched_query would result in losing possible custom query vars.
* Hence $query and $wp->matched_query are merged and unneeded/conflictual keys (e.g. 'error') from $query are removed.
*/

if ( isset( $wp->matched_query ) ) {
if ( isset( $query['error'] ) ){
unset( $query['error'] );
}
herrvigg marked this conversation as resolved.
Show resolved Hide resolved
$query = array_merge( wp_parse_args( $wp->matched_query ), $query );
}

Expand All @@ -370,6 +377,12 @@ function filter_request( $query ) {

// -> page
elseif ( isset( $query['pagename'] ) || isset( $query['page_id'] ) ):
/* 'name' key from passed $query var is removed if 'pagename' key is present in $wp->matched_query.
* Both keys causes conflict between posts and pages as 'name' is used for posts, resulting in 404 error.
*/
if ( isset( $query['name'] ) ) {
unset($query['name']);
}
herrvigg marked this conversation as resolved.
Show resolved Hide resolved
$page = wp_cache_get( 'qts_page_request' );
if ( ! $page ) {
$page = isset( $query['page_id'] ) ? get_post( $query['page_id'] ) : $this->get_page_by_path( $query['pagename'] );
Expand All @@ -384,20 +397,9 @@ function filter_request( $query ) {
$query['pagename'] = get_page_uri( $page );
$function = 'get_page_link';

// -> post
elseif ( isset( $query['name'] ) || isset( $query['p'] ) ):
$post = isset( $query['p'] ) ? get_post( $query['p'] ) : $this->get_page_by_path( $query['name'], OBJECT, 'post' );
if ( ! $post ) {
return $query;
}
$query['name'] = $post->post_name;
$id = $post->ID;
$cache_array = array( $post );
update_post_caches( $cache_array );
$function = 'get_permalink';

// -> category
elseif ( ( isset( $query['category_name'] ) || isset( $query['cat'] ) ) ):
// If 'name' key is defined, query is relevant to a post with a /%category%/%postname%/ permalink structure and will be captured later.
elseif ( ( ( isset( $query['category_name'] ) || isset( $query['cat'] ) ) && ! isset($query['name'] ) ) ):
if ( isset( $query['category_name'] ) ) {
$term_slug = $this->get_last_slash( empty( $query['category_name'] ) ? $wp->request : $query['category_name'] );
$term = $this->get_term_by( 'slug', $term_slug, 'category' );
Expand Down Expand Up @@ -427,6 +429,9 @@ function filter_request( $query ) {
$function = 'get_tag_link';

else:

// If none of the conditions above are matched, specific tests to identify custom post types and taxonomies are performed here.

// -> custom post type
foreach ( $this->get_public_post_types() as $post_type ) {
if ( array_key_exists( $post_type->name, $query ) && ! in_array( $post_type->name, array(
Expand All @@ -437,7 +442,6 @@ function filter_request( $query ) {
break;
}
}

if ( isset( $query['post_type'] ) ) {
if ( count( $query ) == 1 ) {
$function = 'get_post_type_archive_link';
Expand Down Expand Up @@ -471,6 +475,25 @@ function filter_request( $query ) {
$function = 'get_term_link';
}
endforeach;
herrvigg marked this conversation as resolved.
Show resolved Hide resolved

/* As 'name' key is present also at least both for pages and custom post types, this condition alone cannot be used to identify uniquely the posts.
* For pages and custom post types specific tests can be and are performed earlier but no additional specific condition seems to be applicable for posts.
* Given the above, the following test needs to be placed after the custom post types one, and is it positive if 'name' key is there and no other match is found earlier.
* If a specific condition was found to uniquely identify posts, this block should be placed in the main if block.
*/

// -> post
if ( ! $function && ( isset($query['name']) || isset($query['p'] ) ) ) {
$post = isset($query['p']) ? get_post($query['p']) : $this->get_page_by_path($query['name'], OBJECT, 'post');
if (!$post) {
return $query;
}
$query['name'] = $post->post_name;
$id = $post->ID;
$cache_array = array($post);
update_post_caches($cache_array);
$function = 'get_permalink';
}
herrvigg marked this conversation as resolved.
Show resolved Hide resolved
endif;

if ( isset( $function ) ) {
Expand Down Expand Up @@ -919,12 +942,12 @@ private function generate_extra_rules( $name = false ) {
$struct = $wp_rewrite->extra_permastructs[ $name ];
if ( is_array( $struct ) ) {
if ( count( $struct ) == 2 ) {
$rules = $wp_rewrite->generate_rewrite_rules( "/$base/%$name%", $struct[1] );
$rules = $wp_rewrite->generate_rewrite_rules( "/".rawurldecode($base)."/%".rawurldecode($name)."%", $struct[1] );
} else {
$rules = $wp_rewrite->generate_rewrite_rules( "/$base/%$name%", $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
$rules = $wp_rewrite->generate_rewrite_rules( "/".rawurldecode($base)."/%".rawurldecode($name)."%", $struct['ep_mask'], $struct['paged'], $struct['feed'], $struct['forcomments'], $struct['walk_dirs'], $struct['endpoints'] );
}
} else {
$rules = $wp_rewrite->generate_rewrite_rules( "/$base/%$name%" );
$rules = $wp_rewrite->generate_rewrite_rules( "/".rawurldecode($base)."/%".rawurldecode($name)."%" );
}
$wp_rewrite->rules = array_merge( $rules, $wp_rewrite->rules );
endif;
Expand Down