<!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>[12860] trunk/wp-admin/options-permalink.php:
Change options-permalinks to use is_main_site(), fix /blog offset display,
See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12860">12860</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-26 23:02:49 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change options-permalinks to use is_main_site(), fix /blog offset display, See <a href="http://trac.wordpress.org/ticket/11644">#11644</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 (12859 => 12860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-01-26 22:49:05 UTC (rev 12859)
+++ trunk/wp-admin/options-permalink.php 2010-01-26 23:02:49 UTC (rev 12860)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $permalink_structure = $_POST['permalink_structure'];
</span><span class="cx"> if (! empty($permalink_structure) )
</span><span class="cx"> $permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
</span><del>- if ( is_multisite() && !is_subdomain_install() && $permalink_structure != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
</del><ins>+ if ( is_multisite() && !is_subdomain_install() && $permalink_structure != '' && is_main_site() ) {
</ins><span class="cx"> $permalink_structure = '/blog' . $permalink_structure;
</span><span class="cx"> }
</span><span class="cx"> $wp_rewrite->set_permalink_structure($permalink_structure);
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> $category_base = $_POST['category_base'];
</span><span class="cx"> if (! empty($category_base) )
</span><span class="cx"> $category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
</span><del>- if ( is_multisite() && !is_subdomain_install() && $category_base != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
</del><ins>+ if ( is_multisite() && !is_subdomain_install() && $category_base != '' && is_main_site() ) {
</ins><span class="cx"> $category_base = '/blog' . $category_base;
</span><span class="cx"> }
</span><span class="cx"> $wp_rewrite->set_category_base($category_base);
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> $tag_base = $_POST['tag_base'];
</span><span class="cx"> if (! empty($tag_base) )
</span><span class="cx"> $tag_base = preg_replace('#/+#', '/', '/' . $_POST['tag_base']);
</span><del>- if ( is_multisite() && !is_subdomain_install() && $tag_base != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
</del><ins>+ if ( is_multisite() && !is_subdomain_install() && $tag_base != '' && is_main_site() ) {
</ins><span class="cx"> $tag_base = '/blog' . $tag_base;
</span><span class="cx"> }
</span><span class="cx"> $wp_rewrite->set_tag_base($tag_base);
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> </label>
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <?php if ( is_multisite() && !is_subdomain_install() && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) { echo "/blog"; $permalink_structure = str_replace( "/blog", "", $permalink_structure ); }?>
</del><ins>+ <?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $permalink_structure = preg_replace( "|/?blog|", "", $permalink_structure ); }?>
</ins><span class="cx"> <input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="lines">@@ -219,11 +219,11 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
</span><del>- <td><?php if ( is_multisite() && !is_subdomain_install() && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) { echo "/blog"; $category_base = str_replace( "/blog", "", $category_base ); }?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
</del><ins>+ <td><?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $category_base = preg_replace( "|^/?blog|", "", $category_base ); }?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
</span><del>- <td><?php if ( is_multisite() && !is_subdomain_install() && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) { echo "/blog"; $tag_base = str_replace( "/blog", "", $tag_base ); }?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
</del><ins>+ <td><?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $tag_base = preg_replace( "|/?blog|", "", $tag_base ); }?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <?php do_settings_fields('permalink', 'optional'); ?>
</span><span class="cx"> </table>
</span></span></pre>
</div>
</div>
</body>
</html>