Changeset 27327

Timestamp:

02/28/2014 08:54:05 PM (13 years ago)

Author:

johnbillion

Message:

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

File:

• trunk/src/wp-includes/rewrite.php (modified) (4 diffs)

trunk/src/wp-includes/rewrite.php

@@ -251 +251 @@
  * @param string $name Name of the endpoint.
  * @param int $places Endpoint mask describing the places the endpoint should be added.
- */
-function add_rewrite_endpoint( $name, $places ) {
+ * @param string $query_var Name of the corresponding query variable. Defaults to $name.
+ */
+function add_rewrite_endpoint( $name, $places, $query_var = null ) {
         global $wp_rewrite;
-        $wp_rewrite->add_endpoint( $name, $places );
+        $wp_rewrite->add_endpoint( $name, $places, $query_var );
 }
 
@@ -1266 +1267 @@
                                 $epmatch = $endpoint[1] . '(/(.*))?/?$';
                                 //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 );
                         }
@@ -1823 +1824 @@
          * @see add_rewrite_endpoint()
          * @since 2.1.0
+         * @since 3.9.0 $query_var parameter added.
          * @access public
          * @uses WP::add_query_var()
@@ -1828 +1830 @@
          * @param string $name Name of the endpoint.
          * @param int $places Endpoint mask describing the places the endpoint should be added.
-         */
-        function add_endpoint($name, $places) {
+         * @param string $query_var Name of the corresponding query variable. Defaults to $name.
+         */
+        function add_endpoint( $name, $places, $query_var = null ) {
                 global $wp;
-                $this->endpoints[] = array ( $places, $name );
-                $wp->add_query_var($name);
+                if ( null === $query_var ) {
+                        $query_var = $name;
+                }
+                $this->endpoints[] = array( $places, $name, $query_var );
+                $wp->add_query_var( $query_var );
         }