Changeset 12712 for trunk/wp-admin/options-permalink.php

Timestamp:

01/12/2010 09:11:52 PM (17 years ago)

Author:

wpmuguru

Message:

merge multisite admin - edit links,tags,cats,options, See #11644

Location:

trunk/wp-admin

Files:

• . (modified) (1 prop)
• options-permalink.php (modified) (7 diffs)

trunk/wp-admin/options-permalink.php

@@ -83 +83 @@
                 if (! empty($permalink_structure) )
                         $permalink_structure = preg_replace('#/+#', '/', '/' . $_POST['permalink_structure']);
+                if ( is_multisite() && !is_subdomain_install()  && $permalink_structure != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
+                        $permalink_structure = '/blog' . $permalink_structure;
+                }
                 $wp_rewrite->set_permalink_structure($permalink_structure);
         }
@@ -90 +93 @@
                 if (! empty($category_base) )
                         $category_base = preg_replace('#/+#', '/', '/' . $_POST['category_base']);
+                if ( is_miltisite() && !is_subdomain_install() && $category_base != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
+                        $category_base = '/blog' . $category_base;
+                }
                 $wp_rewrite->set_category_base($category_base);
         }
@@ -97 +103 @@
                 if (! empty($tag_base) )
                         $tag_base = preg_replace('#/+#', '/', '/' . $_POST['tag_base']);
+                if ( is_multisite() && !is_subdomain_install() && $tag_base != '' && $current_site->domain.$current_site->path == $current_blog->domain.$current_blog->path ) {
+                        $tag_base = '/blog' . $tag_base;
+                }
                 $wp_rewrite->set_tag_base($tag_base);
         }
@@ -195 +204 @@
                 </th>
                 <td>
+                        <?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 ); }?>
                         <input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
                 </td>
@@ -210 +220 @@
         <tr>
                 <th><label for="category_base"><?php _e('Category base'); ?></label></th>
-                <td><input name="category_base" id="category_base" type="text" value="<?php echo esc_attr($category_base); ?>" class="regular-text code" /></td>
+                <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>
         </tr>
         <tr>
                 <th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
-                <td><input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
+                <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>
         </tr>
         <?php do_settings_fields('permalink', 'optional'); ?>
@@ -225 +235 @@
 </p>
   </form>
+<?php if ( !is_multisite || is_super_admin() ) { ?>
 <?php if ($iis7_permalinks) :
         if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : 
@@ -252 +263 @@
         <?php endif; ?>
 <?php endif; ?>
+<?php } // multisite ?>
 
 </div>