WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-09 07:00:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow rewrite endpoints to specify a query variable name. Fixes #20905.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@27327


git-svn-id: http://core.svn.wordpress.org/trunk@27179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-02-28 20:55:14 +00:00
parent 44e34f826b
commit 2739d652ef
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/rewrite.php
View File

@ -250,10 +250,11 @@ define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEAR
* *
* @param string $name Name of the endpoint. * @param string $name Name of the endpoint.
* @param int $places Endpoint mask describing the places the endpoint should be added. * @param int $places Endpoint mask describing the places the endpoint should be added.
* @param string $query_var Name of the corresponding query variable. Defaults to $name.
*/ */
function add_rewrite_endpoint( $name, $places ) { function add_rewrite_endpoint( $name, $places, $query_var = null ) {
global $wp_rewrite; global $wp_rewrite;
$wp_rewrite->add_endpoint( $name, $places ); $wp_rewrite->add_endpoint( $name, $places, $query_var );
} }
/** /**
@ -1265,7 +1266,7 @@ class WP_Rewrite {
//match everything after the endpoint name, but allow for nothing to appear there //match everything after the endpoint name, but allow for nothing to appear there
$epmatch = $endpoint[1] . '(/(.*))?/?$'; $epmatch = $endpoint[1] . '(/(.*))?/?$';
//this will be appended on to the rest of the query for each dir //this will be appended on to the rest of the query for each dir
$epquery = '&' . $endpoint[1] . '='; $epquery = '&' . $endpoint[2] . '=';
$ep_query_append[$epmatch] = array ( $endpoint[0], $epquery ); $ep_query_append[$epmatch] = array ( $endpoint[0], $epquery );
} }
} }
@ -1822,16 +1823,21 @@ class WP_Rewrite {
* *
* @see add_rewrite_endpoint() * @see add_rewrite_endpoint()
* @since 2.1.0 * @since 2.1.0
* @since 3.9.0 $query_var parameter added.
* @access public * @access public
* @uses WP::add_query_var() * @uses WP::add_query_var()
* *
* @param string $name Name of the endpoint. * @param string $name Name of the endpoint.
* @param int $places Endpoint mask describing the places the endpoint should be added. * @param int $places Endpoint mask describing the places the endpoint should be added.
* @param string $query_var Name of the corresponding query variable. Defaults to $name.
*/ */
function add_endpoint($name, $places) { function add_endpoint( $name, $places, $query_var = null ) {
global $wp; global $wp;
$this->endpoints[] = array ( $places, $name ); if ( null === $query_var ) {
$wp->add_query_var($name); $query_var = $name;
}
$this->endpoints[] = array( $places, $name, $query_var );
$wp->add_query_var( $query_var );
} }
/** /**