Wordpress 3.7

[autoinstalls/wordpress.git] / wp-admin / options-permalink.php

diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index 906361e8a8fac0bbb2835cd7786f83104a334991..738a0c3f8f6142efdf5a9750ebd81615c2bd06b4 100644 (file)
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -7,7 +7,7 @@
  */
 
 /** WordPress Administration Bootstrap */
  */
 
 /** WordPress Administration Bootstrap */

-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );

 
 if ( ! current_user_can( 'manage_options' ) )
        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
 
 if ( ! current_user_can( 'manage_options' ) )
        wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );


@@ -71,13 +71,11 @@ jQuery(document).ready(function() {
 }
 add_filter('admin_head', 'options_permalink_add_js');
 
 }
 add_filter('admin_head', 'options_permalink_add_js');
 

-include('./admin-header.php');
-

 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
 
 $prefix = $blog_prefix = '';
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
 
 $prefix = $blog_prefix = '';

-if ( ! got_mod_rewrite() && ! $iis7_permalinks )
+if ( ! got_url_rewrite() )

        $prefix = '/index.php';
 if ( is_multisite() && !is_subdomain_install() && is_main_site() )
        $blog_prefix = '/blog';
        $prefix = '/index.php';
 if ( is_multisite() && !is_subdomain_install() && is_main_site() )
        $blog_prefix = '/blog';


@@ -115,7 +113,8 @@ if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
                $wp_rewrite->set_tag_base( $tag_base );
        }
 
                $wp_rewrite->set_tag_base( $tag_base );
        }
 

-       create_initial_taxonomies();
+       wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
+       exit;

 }
 
 $permalink_structure = get_option('permalink_structure');
 }
 
 $permalink_structure = get_option('permalink_structure');


@@ -127,6 +126,8 @@ if ( $iis7_permalinks ) {
                $writable = true;
        else
                $writable = false;
                $writable = true;
        else
                $writable = false;

+} elseif ( $is_nginx ) {
+       $writable = false;

 } else {
        if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') )
                $writable = true;
 } else {
        if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') )
                $writable = true;


@@ -141,7 +142,9 @@ else
 
 flush_rewrite_rules();
 
 
 flush_rewrite_rules();
 

-if (isset($_POST['submit'])) : ?>
+require( ABSPATH . 'wp-admin/admin-header.php' );
+
+if ( ! empty( $_GET['settings-updated'] ) ) : ?>

 <div id="message" class="updated"><p><?php
 if ( ! is_multisite() ) {
        if ( $iis7_permalinks ) {
 <div id="message" class="updated"><p><?php
 if ( ! is_multisite() ) {
        if ( $iis7_permalinks ) {


@@ -151,6 +154,8 @@ if ( ! is_multisite() ) {
                        _e('Permalink structure updated. Remove write access on web.config file now!');
                else
                        _e('Permalink structure updated.');
                        _e('Permalink structure updated. Remove write access on web.config file now!');
                else
                        _e('Permalink structure updated.');

+       } elseif ( $is_nginx ) {
+               _e('Permalink structure updated.');

        } else {
                if ( $permalink_structure && ! $usingpi && ! $writable )
                        _e('You should update your .htaccess now.');
        } else {
                if ( $permalink_structure && ! $usingpi && ! $writable )
                        _e('You should update your .htaccess now.');


@@ -171,7 +176,7 @@ if ( ! is_multisite() ) {
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 

-  <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>
+  <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>

 
 <?php
 if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
 
 <?php
 if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {


@@ -188,7 +193,7 @@ $structures = array(
        4 => $prefix . '/%postname%/',
 );
 ?>
        4 => $prefix . '/%postname%/',
 );
 ?>

-<h3><?php _e('Common Settings'); ?></h3>
+<h3 class="title"><?php _e('Common Settings'); ?></h3>

 <table class="form-table permalink-structure">
        <tr>
                <th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>
 <table class="form-table permalink-structure">
        <tr>
                <th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th>


@@ -223,11 +228,11 @@ $structures = array(
        </tr>
 </table>
 
        </tr>
 </table>
 

-<h3><?php _e('Optional'); ?></h3>
+<h3 class="title"><?php _e('Optional'); ?></h3>

 <?php
 <?php

-$suffix = '';
-if ( ! $is_apache && ! $iis7_permalinks )
-       $suffix = 'index.php/';
+$suffix = $prefix;
+if ( $suffix )
+       $suffix = ltrim( $suffix, '/' ) . '/';

 ?>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL path. */
 ?>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL path. */


@@ -268,7 +273,7 @@ printf( __('If you like, you may enter custom structures for your category and t
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
                <?php endif; ?>
        <?php endif; ?>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
                <?php endif; ?>
        <?php endif; ?>

-<?php else :
+<?php elseif ( ! $is_nginx ) :

        if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
 <p><?php _e('If your <code>.htaccess</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 these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
        if ( $permalink_structure && ! $usingpi && ! $writable ) : ?>
 <p><?php _e('If your <code>.htaccess</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 these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">


@@ -281,4 +286,4 @@ printf( __('If you like, you may enter custom structures for your category and t
 
 </div>
 
 
 </div>
 

-<?php require('./admin-footer.php'); ?>
+<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>