<!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>[14051] trunk/wp-admin/options-permalink.php:
Check the appropriate radio option on the Permalinks page for the Root blog
; Display index.php prefixes properly for the root Multisite Blog.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14051">14051</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-10 11:30:34 +0000 (Sat, 10 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check the appropriate radio option on the Permalinks page for the Root blog; Display index.php prefixes properly for the root Multisite Blog. Fixes <a href="http://trac.wordpress.org/ticket/12952">#12952</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 (14050 => 14051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-04-10 11:23:21 UTC (rev 14050)
+++ trunk/wp-admin/options-permalink.php 2010-04-10 11:30:34 UTC (rev 14051)
</span><span class="lines">@@ -75,36 +75,33 @@
</span><span class="cx"> $home_path = get_home_path();
</span><span class="cx"> $iis7_permalinks = iis7_supports_permalinks();
</span><span class="cx">
</span><ins>+$prefix = '';
+if ( ! got_mod_rewrite() && ! $iis7_permalinks )
+ $prefix .= '/index.php';
+if ( is_multisite() && !is_subdomain_install() && is_main_site() )
+ $prefix .= '/blog';
+
</ins><span class="cx"> if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
</span><span class="cx"> check_admin_referer('update-permalink');
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['permalink_structure'] ) ) {
</span><span class="cx"> $permalink_structure = $_POST['permalink_structure'];
</span><del>- if ( ! empty( $permalink_structure ) ) {
- $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
- if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
- $permalink_structure = '/blog' . $permalink_structure;
- }
</del><ins>+ if ( ! empty( $permalink_structure ) )
+ $permalink_structure = $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><del>- if (! empty( $category_base ) ) {
- $category_base = preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
- if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
- $category_base = '/blog' . $category_base;
- }
</del><ins>+ if ( ! empty( $category_base ) )
+ $category_base = $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><del>- if ( ! empty( $tag_base ) ) {
- $tag_base = preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
- if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
- $tag_base = '/blog' . $tag_base;
- }
</del><ins>+ if ( ! empty( $tag_base ) )
+ $tag_base = $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">@@ -166,16 +163,20 @@
</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>-$prefix = '';
-
</del><span class="cx"> if ( ! got_mod_rewrite() && ! $iis7_permalinks )
</span><del>- $prefix = '/index.php';
</del><ins>+ $permalink_structure = preg_replace( '|^/?index\.php|', '', $permalink_structure );
</ins><span class="cx">
</span><ins>+if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
+ $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
+ $category_base = preg_replace( '|^/?blog|', '', $category_base );
+ $tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+}
+
</ins><span class="cx"> $structures = array(
</span><span class="cx"> '',
</span><del>- $prefix . '/%year%/%monthnum%/%day%/%postname%/',
- $prefix . '/%year%/%monthnum%/%postname%/',
- $prefix . '/archives/%post_id%'
</del><ins>+ '/%year%/%monthnum%/%day%/%postname%/',
+ '/%year%/%monthnum%/%postname%/',
+ '/archives/%post_id%'
</ins><span class="cx"> );
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php _e('Common settings'); ?></h3>
</span><span class="lines">@@ -198,16 +199,12 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th>
</span><del>- <label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog"
- <?php if ( !in_array($permalink_structure, $structures) ) { ?>
- checked="checked"
- <?php } ?>
- />
</del><ins>+ <label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
</ins><span class="cx"> <?php _e('Custom Structure'); ?>
</span><span class="cx"> </label>
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $permalink_structure = preg_replace( "|^/?blog|", "", $permalink_structure ); }?>
</del><ins>+ <?php echo $prefix; ?>
</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">@@ -223,11 +220,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() && 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>
</del><ins>+ <td><?php echo $prefix; ?> <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() && 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>
</del><ins>+ <td><?php echo $prefix; ?> <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 class="lines">@@ -239,7 +236,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <?php if ( !is_multisite() ) { ?>
</span><del>-<?php if ($iis7_permalinks) :
</del><ins>+<?php if ( $iis7_permalinks ) :
</ins><span class="cx"> if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
</span><span class="cx"> if ( file_exists($home_path . 'web.config') ) : ?>
</span><span class="cx"> <p><?php _e('If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
</span></span></pre>
</div>
</div>
</body>
</html>