Ticket #1762: customise_other_bases.diff

wp-includes/classes.php

@@ -1356 +1356 @@
                 if ($this->using_index_permalinks()) {
                         $this->root = $this->index . '/';
                 }
-                $this->category_base = get_settings('category_base');
+                foreach (array('category_base', 'author_base', 'feed_base', 'comments_base') as $base) {
+                        $this->$base = get_settings($base);
+                }
                 unset($this->category_structure);
                 unset($this->author_structure);
                 unset($this->date_structure);
@@ -1379 +1381 @@
                         $this->init();
                 }
         }
+        
+        function set_author_base($author_base) {
+                if ($author_base != $this->author_base) {
+                        update_option('author_base', $author_base);
+                        $this->init();
+                }
+        }
+        
+        function set_feed_base($feed_base) {
+                if ($feed_base != $this->feed_base) {
+                        update_option('feed_base', $feed_base);
+                        $this->init();
+                }
+        }
+        
+        function set_comments_base($comments_base) {
+                if ($comments_base != $this->comments_base) {
+                        update_option('comments_base', $comments_base);
+                        $this->init();
+                }
+        }
 
         function WP_Rewrite() {
                 $this->init();

wp-includes/feed-functions.php

@@ -79 +79 @@
 }
 
 function comments_rss($commentsrssfilename = '') {
-        global $id;
+        global $id, $wp_rewrite;
 
         if ('' != get_settings('permalink_structure'))
-                $url = trailingslashit( get_permalink() ) . 'feed/';
+                $url = trailingslashit( get_permalink() ) . $wp_rewrite->feed_base;
         else
                 $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&p=$id";
 

wp-admin/options-permalink.php

@@ -62 +62 @@
                 $wp_rewrite->set_permalink_structure($permalink_structure);
         }
         
-        if ( isset($_POST['category_base']) ) {
-                $category_base = $_POST['category_base'];
-                if (! empty($category_base) )
-                        $category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
-                $wp_rewrite->set_category_base($category_base);
+        foreach (array('category_base', 'author_base', 'feed_base', 'comments_base') as $base) {
+                if ( isset($_POST[$base]) ) {
+                        if (! empty($_POST[$base]) )
+                                $_POST[$base] = preg_replace('#/+#', '/', '/' . $_POST[$base]);
+                        $set_base_func = 'set_' . $base;
+                        $wp_rewrite->$set_base_func($_POST[$base]);
+                }
         }
 }
         
-$permalink_structure = get_settings('permalink_structure');
-$category_base = get_settings('category_base');
+$permalink_structure    = get_settings('permalink_structure');
+$category_base                  = get_settings('category_base');
+$author_base                    = get_settings('author_base');
+$feed_base                              = get_settings('feed_base');
+$comments_base                  = get_settings('comments_base');
 
 generate_page_rewrite_rules();
 
@@ -133 +138 @@
 </p>
 <p id="customstructure"><?php _e('Custom structure'); ?>: <input name="permalink_structure" id="permalink_structure" type="text" class="code" style="width: 60%;" value="<?php echo $permalink_structure; ?>" size="50" /></p>
 
+<input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" />
+
 <h3><?php _e('Optional'); ?></h3>
-<?php if ($is_apache) : ?>
-        <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/taxonomy/tags</code> would make your category links like <code>http://example.org/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
-<?php else : ?>
-        <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
-<?php endif; ?>
-        <p> 
-  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" /> 
-     </p> 
-    <p class="submit"> 
-      <input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /> 
+<p><?php _e('Extra options: these following options govern how your different permalinks for categories, authors, feeds and so on are constructed. For example, changing the category base option to \'/taxonomy/tags\' means that the archives for your categories will be at \'/taxonomy/tags/[category name]\'. The feed base will be appended to permalinks to make feed URLs. The comment base will be appended to permalinks then the feed base appended to that to make comment base URLs. If any of these are left blank the defaults will be used.'); ?></p>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
+        <tr valign="top">
+                <th width="33%" scope="row"><?php _e('Category Base:') ?></th> 
+                <td><input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" /></td> 
+        </tr>
+        <tr valign="top">
+                <th width="33%" scope="row"><?php _e('Author Base:') ?></th> 
+                <td><input name="author_base" type="text" class="code"  value="<?php echo $author_base; ?>" size="30" /></td> 
+        </tr>
+        <tr valign="top">
+                <th width="33%" scope="row"><?php _e('Feed Base:') ?></th> 
+                <td><input name="feed_base" type="text" class="code"  value="<?php echo $feed_base; ?>" size="30" /></td> 
+        </tr>
+        <tr valign="top">
+                <th width="33%" scope="row"><?php _e('Comments feed Base:') ?></th> 
+                <td><input name="comments_base" type="text" class="code"  value="<?php echo $comments_base; ?>" size="30" /></td> 
+        </tr>
+</table>
+        
+      <input type="submit" name="submit" value="<?php _e('Update Bases &raquo;') ?>" /> 
     </p> 
   </form> 
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>