<!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>[20596] trunk: Remove wp-register.php.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20596">20596</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-25 20:49:57 +0000 (Wed, 25 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove wp-register.php.
* Don't remove it on update. If you have it now, you'll keep it. New installs won't get it.
* Peform a redirect using rewrite + canonical to the new location, if the file doesn't exist.
props SergeyBiryukov.
fixes <a href="http://core.trac.wordpress.org/ticket/18544">#18544</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpregisterphp">trunk/wp-register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (20595 => 20596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php        2012-04-25 20:38:40 UTC (rev 20595)
+++ trunk/wp-includes/canonical.php        2012-04-25 20:49:57 UTC (rev 20596)
</span><span class="lines">@@ -277,6 +277,15 @@
</span><span class="cx">                                 $redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
</span><span class="cx">                         $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
</span><span class="cx">                 }
</span><ins>+
+                if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
+                        if ( is_multisite() )
+                                $redirect_url = apply_filters( 'wp_signup_location', site_url( 'wp-signup.php' ) );
+                        else
+                                $redirect_url = site_url( 'wp-login.php?action=register' );
+                        wp_redirect( $redirect_url, 301 );
+                        die();
+                }
</ins><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         // tack on any additional query vars
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (20595 => 20596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php        2012-04-25 20:38:40 UTC (rev 20595)
+++ trunk/wp-includes/rewrite.php        2012-04-25 20:49:57 UTC (rev 20596)
</span><span class="lines">@@ -1534,6 +1534,7 @@
</span><span class="cx">                         $registration_pages['.*wp-signup.php$'] = $this->index . '?signup=true';
</span><span class="cx">                         $registration_pages['.*wp-activate.php$'] = $this->index . '?activate=true';
</span><span class="cx">                 }
</span><ins>+                $registration_pages['.*wp-register.php$'] = $this->index . '?register=true'; // Deprecated
</ins><span class="cx">
</span><span class="cx">                 // Post
</span><span class="cx">                 $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false, true, false, false );
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (20595 => 20596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php        2012-04-25 20:38:40 UTC (rev 20595)
+++ trunk/wp-includes/version.php        2012-04-25 20:49:57 UTC (rev 20596)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 20148;
</del><ins>+$wp_db_version = 20596;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre></div>
<a id="trunkwpregisterphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-register.php (20595 => 20596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-register.php        2012-04-25 20:38:40 UTC (rev 20595)
+++ trunk/wp-register.php        2012-04-25 20:49:57 UTC (rev 20596)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-<?php
-/**
- * Used to be the page which displayed the registration form.
- *
- * This file is no longer used in WordPress and is
- * deprecated.
- *
- * @package WordPress
- * @deprecated Use wp_register() to create a registration link instead
- */
-
-require('./wp-load.php');
-wp_redirect( site_url('wp-login.php?action=register') );
-exit;
</del></span></pre>
</div>
</div>
</body>
</html>