<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34958] trunk/src/wp-includes/class-wp-rewrite.php: Docs: Improve more formatting and syntax for inline comments in `WP_Rewrite`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34958">34958</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34958","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-08 21:23:31 +0000 (Thu, 08 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Improve more formatting and syntax for inline comments in `WP_Rewrite`.
See <a href="https://core.trac.wordpress.org/ticket/34218">#34218</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswprewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php 2015-10-08 21:17:14 UTC (rev 34957)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2015-10-08 21:23:31 UTC (rev 34958)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1242,20 +1242,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $home_path = parse_url( home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Old feed and service files
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Old feed and service files.
</ins><span class="cx" style="display: block; padding: 0 10px"> $deprecated_files = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2)\.php$' => $this->index . '?feed=old',
</span><span class="cx" style="display: block; padding: 0 10px"> '.*wp-app\.php(/.*)?$' => $this->index . '?error=403',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Registration rules
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Registration rules.
</ins><span class="cx" style="display: block; padding: 0 10px"> $registration_pages = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && is_main_site() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
</span><span class="cx" style="display: block; padding: 0 10px"> $registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Deprecated.
+ $registration_pages['.*wp-register.php$'] = $this->index . '?register=true';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Post rewrite rules.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1475,19 +1477,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rules = "<IfModule mod_rewrite.c>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $rules .= "RewriteEngine On\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $rules .= "RewriteBase $home_root\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rules .= "RewriteRule ^index\.php$ - [L]\n"; // Prevent -f checks on index.php.
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent -f checks on index.php.
+ $rules .= "RewriteRule ^index\.php$ - [L]\n";
+
+ // Add in the rules that don't redirect to WP's index.php (and thus shouldn't be handled by WP at all).
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $this->non_wp_rules as $match => $query) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Apache 1.3 does not support the reluctant (non-greedy) modifier.
</span><span class="cx" style="display: block; padding: 0 10px"> $match = str_replace('.+?', '.+', $match);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the match is unanchored and greedy, prepend rewrite conditions
- // to avoid infinite redirects and eclipsing of real files.
- //if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
- //nada.
- //}
-
</del><span class="cx" style="display: block; padding: 0 10px"> $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1503,12 +1501,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Apache 1.3 does not support the reluctant (non-greedy) modifier.
</span><span class="cx" style="display: block; padding: 0 10px"> $match = str_replace('.+?', '.+', $match);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If the match is unanchored and greedy, prepend rewrite conditions
- // to avoid infinite redirects and eclipsing of real files.
- //if ($match == '(.+)/?$' || $match == '([^/]+)/?$' ) {
- //nada.
- //}
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( strpos($query, $this->index) !== false )
</span><span class="cx" style="display: block; padding: 0 10px"> $rules .= 'RewriteRule ^' . $match . ' ' . $home_root . $query . " [QSA,L]\n";
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,7 +1515,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rules .= "</IfModule>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * Filter the list of rewrite rules formatted for output to an .htaccess file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1619,7 +1610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $external = $front != $this->index;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // "external" = it doesn't correspond to index.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // "external" = it doesn't correspond to index.php.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $external ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_external_rule( $regex, $query );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1664,7 +1655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_endpoint( $name, $places, $query_var = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // For backward compatibility, if `null` has explicitly been passed as `$query_var`, assume `true`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For backward compatibility, if null has explicitly been passed as `$query_var`, assume `true`.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( true === $query_var || null === func_get_arg( 2 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_var = $name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1704,7 +1695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * - endpoints (bool) - Should endpoints be applied to the generated rewrite rules? Default is true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_permastruct( $name, $struct, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // backwards compatibility for the old parameters: $with_front and $ep_mask
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Backwards compatibility for the old parameters: $with_front and $ep_mask.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $args ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array( 'with_front' => $args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( func_num_args() == 4 )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1738,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function flush_rules( $hard = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $do_hard_later = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Prevent this action from running before everyone has registered their rewrites
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent this action from running before everyone has registered their rewrites.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! did_action( 'wp_loaded' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_loaded', array( $this, 'flush_rules' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $do_hard_later = ( isset( $do_hard_later ) ) ? $do_hard_later || $hard : $hard;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,6 +1752,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option('rewrite_rules');
</span><span class="cx" style="display: block; padding: 0 10px"> $this->wp_rewrite_rules();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter whether a "hard" rewrite rule flush should be performed when requested.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>