Changes in trunk/wp-admin/options-permalink.php [15000:15233]

File:

• trunk/wp-admin/options-permalink.php (modified) (2 diffs)

trunk/wp-admin/options-permalink.php

@@ -16 +16 @@
 $parent_file = 'options-general.php';
 
-add_contextual_help($current_screen, 
+add_contextual_help($current_screen,
     '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
-    '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
-    '<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%.') . '</p>' .
-    '<p>' . __('Note that permalinks beginning with structure tags calling Category, Tag, Author, or Postname require more advanced server resources. Double-check your hosting details to make sure those are in place or start your permalinks with other structure tags.') . '</p>' .
-    '<p>' . __('The Optional fields lets you have add a base name that will appear in archive URLs intead of &#8220;category&#8221; or &#8220;tag.&#8221; For example, the page listing all posts in the category &#8220;uncategorized&#8221; could be /topics/uncategorized instead of category/uncategorized.') . '</p>' .
+    '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by <code>%</code>, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
+    '<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
+    '<p>' . __('Note that permalinks beginning with the category, tag, author or postname structure tags require more advanced server resources. Double-check your hosting details to make sure those are in place or start your permalinks with other structure tags.') . '</p>' .
+    '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
     '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
     '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="http://codex.wordpress.org/Settings_Permalinks_SubPanel">Permalinks Settings Documentation</a>') . '</p>' .
-    '<p>' . __('<a href="http://codex.wordpress.org/Using_Permalinks">Using Permalinks Documentation</a>') . '</p>' .
-    '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
+    '<p>' . __('<a href="http://codex.wordpress.org/Settings_Permalinks_SubPanel" target="_blank">Permalinks Settings Documentation</a>') . '</p>' .
+    '<p>' . __('<a href="http://codex.wordpress.org/Using_Permalinks" target="_blank">Using Permalinks Documentation</a>') . '</p>' .
+    '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
@@ -99 +99 @@
 
     if ( isset( $_POST['permalink_structure'] ) ) {
-        $permalink_structure = $_POST['permalink_structure'];
+        if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+            $permalink_structure = $_POST['selection'];
+        else
+            $permalink_structure = $_POST['permalink_structure'];
+
         if ( ! empty( $permalink_structure ) ) {
             $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );