<!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>[14553] trunk/wp-admin/options-permalink.php:
revert non-rewrite permalink settings to be compatible with 2.9, see 13106</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14553">14553</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-05-10 22:06:27 +0000 (Mon, 10 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>revert non-rewrite permalink settings to be compatible with 2.9, see 13106</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 (14552 => 14553)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-05-10 21:24:32 UTC (rev 14552)
+++ trunk/wp-admin/options-permalink.php 2010-05-10 22:06:27 UTC (rev 14553)
</span><span class="lines">@@ -75,11 +75,11 @@
</span><span class="cx"> $home_path = get_home_path();
</span><span class="cx"> $iis7_permalinks = iis7_supports_permalinks();
</span><span class="cx">
</span><del>-$prefix = '';
</del><ins>+$prefix = $blog_prefix = '';
</ins><span class="cx"> if ( ! got_mod_rewrite() && ! $iis7_permalinks )
</span><del>- $prefix .= '/index.php';
</del><ins>+ $prefix = '/index.php';
</ins><span class="cx"> if ( is_multisite() && !is_subdomain_install() && is_main_site() )
</span><del>- $prefix .= '/blog';
</del><ins>+ $blog_prefix = '/blog';
</ins><span class="cx">
</span><span class="cx"> if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
</span><span class="cx"> check_admin_referer('update-permalink');
</span><span class="lines">@@ -174,9 +174,9 @@
</span><span class="cx">
</span><span class="cx"> $structures = array(
</span><span class="cx"> '',
</span><del>- '/%year%/%monthnum%/%day%/%postname%/',
- '/%year%/%monthnum%/%postname%/',
- '/archives/%post_id%'
</del><ins>+ $prefix . '/%year%/%monthnum%/%day%/%postname%/',
+ $prefix . '/%year%/%monthnum%/%postname%/',
+ $prefix . '/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">@@ -187,15 +187,15 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
</span><del>- <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
</del><ins>+ <td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
</span><del>- <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
</del><ins>+ <td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
</span><del>- <td><code><?php echo get_option('home') . $prefix ; ?>/archives/123</code></td>
</del><ins>+ <td><code><?php echo get_option('home') . $blog_prefix . $prefix; ?>/archives/123</code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <th>
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> </label>
</span><span class="cx"> </th>
</span><span class="cx"> <td>
</span><del>- <?php echo $prefix; ?>
</del><ins>+ <?php echo $blog_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">@@ -220,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 echo $prefix; ?> <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 $blog_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 echo $prefix; ?> <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 $blog_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></pre>
</div>
</div>
</body>
</html>