<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14732] trunk/wp-admin/options-permalink.php:
restore single WP permalink settings per 2.9.X, related #13106, see #13303</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14732">14732</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-19 03:15:59 +0000 (Wed, 19 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>restore single WP permalink settings per 2.9.X, related <a href="http://trac.wordpress.org/ticket/13106">#13106</a>, see <a href="http://trac.wordpress.org/ticket/13303">#13303</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (14731 => 14732)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-05-18 22:14:52 UTC (rev 14731)
+++ trunk/wp-admin/options-permalink.php 2010-05-19 03:15:59 UTC (rev 14732)
</span><span class="lines">@@ -87,21 +87,21 @@
</span><span class="cx"> if ( isset( $_POST['permalink_structure'] ) ) {
</span><span class="cx"> $permalink_structure = $_POST['permalink_structure'];
</span><span class="cx"> if ( ! empty( $permalink_structure ) )
</span><del>- $permalink_structure = $prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
</del><ins>+ $permalink_structure = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
</ins><span class="cx"> $wp_rewrite->set_permalink_structure( $permalink_structure );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['category_base'] ) ) {
</span><span class="cx"> $category_base = $_POST['category_base'];
</span><span class="cx"> if ( ! empty( $category_base ) )
</span><del>- $category_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
</del><ins>+ $category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
</ins><span class="cx"> $wp_rewrite->set_category_base( $category_base );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['tag_base'] ) ) {
</span><span class="cx"> $tag_base = $_POST['tag_base'];
</span><span class="cx"> if ( ! empty( $tag_base ) )
</span><del>- $tag_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
</del><ins>+ $tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
</ins><span class="cx"> $wp_rewrite->set_tag_base( $tag_base );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -163,9 +163,6 @@
</span><span class="cx"> <p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-if ( ! got_mod_rewrite() && ! $iis7_permalinks )
- $permalink_structure = preg_replace( '|^/?index\.php|', '', $permalink_structure );
-
</del><span class="cx"> if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
</span><span class="cx"> $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
</span><span class="cx"> $category_base = preg_replace( '|^/?blog|', '', $category_base );
</span></span></pre>
</div>
</div>
</body>
</html>