enmi-conf.org: comparison wp/wp-includes/rewrite.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 * @package WordPress
 * @subpackage Rewrite
 */
 /**
-* Endpoint Mask for default, which is nothing.
+* Endpoint mask that matches nothing.
 *
 * @since 2.1.0
 */
 define( 'EP_NONE', 0 );
 /**
-* Endpoint Mask for Permalink.
+* Endpoint mask that matches post permalinks.
 *
 * @since 2.1.0
 */
 define( 'EP_PERMALINK', 1 );
 /**
-* Endpoint Mask for Attachment.
+* Endpoint mask that matches attachment permalinks.
 *
 * @since 2.1.0
 */
 define( 'EP_ATTACHMENT', 2 );
 /**
-* Endpoint Mask for date.
+* Endpoint mask that matches any date archives.
 *
 * @since 2.1.0
 */
 define( 'EP_DATE', 4 );
 /**
-* Endpoint Mask for year
+* Endpoint mask that matches yearly archives.
 *
 * @since 2.1.0
 */
 define( 'EP_YEAR', 8 );
 /**
-* Endpoint Mask for month.
+* Endpoint mask that matches monthly archives.
 *
 * @since 2.1.0
 */
 define( 'EP_MONTH', 16 );
 /**
-* Endpoint Mask for day.
+* Endpoint mask that matches daily archives.
 *
 * @since 2.1.0
 */
 define( 'EP_DAY', 32 );
 /**
-* Endpoint Mask for root.
+* Endpoint mask that matches the site root.
 *
 * @since 2.1.0
 */
 define( 'EP_ROOT', 64 );
 /**
-* Endpoint Mask for comments.
+* Endpoint mask that matches comment feeds.
 *
 * @since 2.1.0
 */
 define( 'EP_COMMENTS', 128 );
 /**
-* Endpoint Mask for searches.
+* Endpoint mask that matches searches.
+*
+* Note that this only matches a search at a "pretty" URL such as
+* `/search/my-search-term`, not `?s=my-search-term`.
 *
 * @since 2.1.0
 */
 define( 'EP_SEARCH', 256 );
 /**
-* Endpoint Mask for categories.
+* Endpoint mask that matches category archives.
 *
 * @since 2.1.0
 */
 define( 'EP_CATEGORIES', 512 );
 /**
-* Endpoint Mask for tags.
+* Endpoint mask that matches tag archives.
 *
 * @since 2.3.0
 */
 define( 'EP_TAGS', 1024 );
 /**
-* Endpoint Mask for authors.
+* Endpoint mask that matches author archives.
 *
 * @since 2.1.0
 */
 define( 'EP_AUTHORS', 2048 );
 /**
-* Endpoint Mask for pages.
+* Endpoint mask that matches pages.
 *
 * @since 2.1.0
 */
 define( 'EP_PAGES', 4096 );
 /**
-* Endpoint Mask for all archive views.
+* Endpoint mask that matches all archive views.
 *
 * @since 3.7.0
 */
 define( 'EP_ALL_ARCHIVES', EP_DATE | EP_YEAR | EP_MONTH | EP_DAY | EP_CATEGORIES | EP_TAGS | EP_AUTHORS );
 /**
-* Endpoint Mask for everything.
+* Endpoint mask that matches everything.
 *
 * @since 2.1.0
 */
 define( 'EP_ALL', EP_PERMALINK | EP_ATTACHMENT | EP_ROOT | EP_COMMENTS | EP_SEARCH | EP_PAGES | EP_ALL_ARCHIVES );
 }
 /**
 * Add a new rewrite tag (like %postname%).
 *
-* The $query parameter is optional. If it is omitted you must ensure that
+* The `$query` parameter is optional. If it is omitted you must ensure that you call
-* you call this on, or before, the {@see 'init'} hook. This is because $query defaults
+* this on, or before, the {@see 'init'} hook. This is because `$query` defaults to
-* to "$tag=", and for this to work a new query var has to be added.
+* `$tag=`, and for this to work a new query var has to be added.
 *
 * @since 2.1.0
 *
 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
 * @global WP         $wp         Current WordPress environment instance.
 *
 * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
 *
 * @param string      $name      Name of the endpoint.
 * @param int         $places    Endpoint mask describing the places the endpoint should be added.
+*                               Accepts a mask of:
+*                               - `EP_ALL`
+*                               - `EP_NONE`
+*                               - `EP_ALL_ARCHIVES`
+*                               - `EP_ATTACHMENT`
+*                               - `EP_AUTHORS`
+*                               - `EP_CATEGORIES`
+*                               - `EP_COMMENTS`
+*                               - `EP_DATE`
+*                               - `EP_DAY`
+*                               - `EP_MONTH`
+*                               - `EP_PAGES`
+*                               - `EP_PERMALINK`
+*                               - `EP_ROOT`
+*                               - `EP_SEARCH`
+*                               - `EP_TAGS`
+*                               - `EP_YEAR`
 * @param string|bool $query_var Name of the corresponding query variable. Pass `false` to skip registering a query_var
 *                               for this endpoint. Defaults to the value of `$name`.
 */
 function add_rewrite_endpoint( $name, $places, $query_var = true ) {
 	global $wp_rewrite;
 	}
 	// If the date of the post doesn't match the date specified in the URL, resolve to the date archive.
 	if ( preg_match( '/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches ) && isset( $query_vars['year'] ) && ( 'monthnum' === $compare || 'day' === $compare ) ) {
 		// $matches[1] is the year the post was published.
-		if ( intval( $query_vars['year'] ) !== intval( $matches[1] ) ) {
+		if ( (int) $query_vars['year'] !== (int) $matches[1] ) {
 			return $query_vars;
 		}
 		// $matches[2] is the month the post was published.
-		if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && intval( $query_vars['monthnum'] ) !== intval( $matches[2] ) ) {
+		if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && (int) $query_vars['monthnum'] !== (int) $matches[2] ) {
 			return $query_vars;
 		}
 	}
 	/*
 		return $query_vars;
 	}
 	// If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage.
 	if ( '' !== $maybe_page ) {
-		$query_vars['page'] = intval( $maybe_page );
+		$query_vars['page'] = (int) $maybe_page;
 	}
 	// Next, unset autodetected date-related query vars.
 	unset( $query_vars['year'] );
 	unset( $query_vars['monthnum'] );

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 19	3d72ae0968f4