WordPress.org
Get WordPress

Make WordPress Core

Changeset 21823


Ignore:
Timestamp:
09/11/2012 10:22:20 PM (14 years ago)
Author:
nacin
Message:

Remove ms-files.php rewriting from WordPress multisite. fixes #19235.

Keep existing networks compatible with a ms_files_rewriting network option.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/includes/ms-deprecated.php

    r20029 r21823  
    7575        return array_map( 'intval', WP_Theme::get_allowed_on_site( $blog_id ) );
    7676}
     77
     78function ms_deprecated_blogs_file() {}

  • trunk/wp-admin/includes/ms.php

    r21813 r21823  
    9191                $wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
    9292
    93                 $dir = apply_filters( 'wpmu_delete_blog_upload_dir', WP_CONTENT_DIR . "/blogs.dir/{$blog_id}/files/", $blog_id );
     93                $uploads = wp_upload_dir();
     94                $dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
    9495                $dir = rtrim( $dir, DIRECTORY_SEPARATOR );
    9596                $top_dir = $dir;
    … …  
    358359        // Allow for an alternative way of tracking storage space used
    359360        $space_used = apply_filters( 'pre_get_space_used', false );
    360         if ( false === $space_used )
    361                 $space_used = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
     361        if ( false === $space_used ) {
     362                $upload_dir = wp_upload_dir();
     363                $space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
     364        }
    362365
    363366        return $space_used;
    … …  
    683686}
    684687
    685 function ms_deprecated_blogs_file() {
    686         if ( ! is_super_admin() )
    687                 return;
    688         if ( ! file_exists( WP_CONTENT_DIR . '/blogs.php' ) )
    689                 return;
    690         echo '<div class="update-nag">' . sprintf( __( 'The <code>%1$s</code> file is deprecated. Please remove it and update your server rewrite rules to use <code>%2$s</code> instead.' ), 'wp-content/blogs.php', 'wp-includes/ms-files.php' ) . '</div>';
    691 }
    692 add_action( 'network_admin_notices', 'ms_deprecated_blogs_file' );
    693 
    694688/**
    695689 * Grants super admin privileges.

  • trunk/wp-admin/includes/schema.php

    r21818 r21823  
    913913                'subdomain_install' => intval( $subdomain_install ),
    914914                'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
     915                'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
    915916                'initial_db_version' => get_option( 'initial_db_version' ),
    916917                'active_sitewide_plugins' => array(),
    … …  
    941942                update_user_meta( $site_user->ID, 'source_domain', $domain );
    942943                update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
    943                 if ( !$upload_path = get_option( 'upload_path' ) ) {
    944                         $upload_path = substr( WP_CONTENT_DIR, strlen( ABSPATH ) ) . '/uploads';
    945                         update_option( 'upload_path', $upload_path );
    946                 }
    947                 update_option( 'fileupload_url', get_option( 'siteurl' ) . '/' . $upload_path );
    948944        }
    949945

  • trunk/wp-admin/includes/upgrade.php

    r21818 r21823  
    12721272                }
    12731273        }
     1274
     1275        // 3.5
     1276        if ( $wp_current_db_version < 21823 )
     1277                update_site_option( 'ms_files_rewriting', '1' );
    12741278}
    12751279

  • trunk/wp-admin/network.php

    r19956 r21823  
    107107        '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
    108108        '<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
    109         '<p>' . __('Add a <code>blogs.dir</code> directory under <code>/wp-content</code> and add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
     109        '<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
    110110        '<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
    111111        '<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
    … …  
    190190                $error_codes = $errors->get_error_codes();
    191191        }
    192 
    193         if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    194                 echo '<div class="error"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
    195192
    196193        $site_name = ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) ? $_POST['sitename'] : sprintf( _x('%s Sites', 'Default network name' ), get_option( 'blogname' ) );
    … …  
    236233        endif;
    237234
     235                if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) )
     236                        echo '<div class="error inline"><p><strong>' . __('Warning!') . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
     237
    238238                $is_www = ( 0 === strpos( $hostname, 'www.' ) );
    239239                if ( $is_www ) :
    … …  
    361361?>
    362362                <ol>
    363                         <li><p><?php
    364                                 printf( __( 'Create a <code>blogs.dir</code> directory at <code>%s/blogs.dir</code>. This directory is used to store uploaded media for your additional sites and must be writeable by the web server.' ), WP_CONTENT_DIR );
    365                                 if ( WP_CONTENT_DIR != ABSPATH . 'wp-content' )
    366                                         echo ' <strong>' . __('Warning:') . ' ' . __( 'Networks may not be fully compatible with custom wp-content directories.' ) . '</strong>';
    367                         ?></p></li>
    368363                        <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That&#8217;s all, stop editing! Happy blogging. */</code>:' ), ABSPATH ); ?></p>
    369364                                <textarea class="code" readonly="readonly" cols="100" rows="7">
    … …  
    416411                    <match url="^index\.php$" ignoreCase="false" />
    417412                    <action type="None" />
    418                 </rule>
    419                 <rule name="WordPress Rule 2" stopProcessing="true">
     413                </rule>';
     414                                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
     415                                        $web_config_file .= '
     416                <rule name="WordPress Rule for Files" stopProcessing="true">
    420417                    <match url="^files/(.+)" ignoreCase="false" />
    421418                    <action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
    422                 </rule>
    423                 <rule name="WordPress Rule 3" stopProcessing="true">
     419                </rule>';
     420                }
     421                $web_config_file .= '
     422                <rule name="WordPress Rule 2" stopProcessing="true">
    424423                    <match url="^" ignoreCase="false" />
    425424                    <conditions logicalGrouping="MatchAny">
    … …  
    429428                    <action type="None" />
    430429                </rule>
    431                 <rule name="WordPress Rule 4" stopProcessing="true">
     430                <rule name="WordPress Rule 3" stopProcessing="true">
    432431                    <match url="." ignoreCase="false" />
    433432                    <action type="Rewrite" url="index.php" />
    … …  
    447446                    <match url="^index\.php$" ignoreCase="false" />
    448447                    <action type="None" />
    449                 </rule>
     448                </rule>';
     449                                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
     450                                        $web_config_file .= '
     451                <rule name="WordPress Rule for Files" stopProcessing="true">
     452                    <match url="^files/(.+)" ignoreCase="false" />
     453                    <action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
     454                </rule>';
     455                }
     456                $web_config_file .= '
    450457                <rule name="WordPress Rule 2" stopProcessing="true">
    451                     <match url="^([_0-9a-zA-Z-]+/)?files/(.+)" ignoreCase="false" />
    452                     <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" />
    453                 </rule>
    454                 <rule name="WordPress Rule 3" stopProcessing="true">
    455458                    <match url="^([_0-9a-zA-Z-]+/)?wp-admin$" ignoreCase="false" />
    456459                    <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" />
    457460                </rule>
    458                 <rule name="WordPress Rule 4" stopProcessing="true">
     461                <rule name="WordPress Rule 3" stopProcessing="true">
    459462                    <match url="^" ignoreCase="false" />
    460463                    <conditions logicalGrouping="MatchAny">
    … …  
    464467                    <action type="None" />
    465468                </rule>
    466                 <rule name="WordPress Rule 5" stopProcessing="true">
     469                <rule name="WordPress Rule 4" stopProcessing="true">
    467470                    <match url="^[_0-9a-zA-Z-]+/(wp-(content|admin|includes).*)" ignoreCase="false" />
    468471                    <action type="Rewrite" url="{R:1}" />
    469472                </rule>
    470                 <rule name="WordPress Rule 6" stopProcessing="true">
     473                <rule name="WordPress Rule 5" stopProcessing="true">
    471474                    <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
    472475                    <action type="Rewrite" url="{R:2}" />
    473476                </rule>
    474                 <rule name="WordPress Rule 7" stopProcessing="true">
     477                <rule name="WordPress Rule 6" stopProcessing="true">
    475478                    <match url="." ignoreCase="false" />
    476479                    <action type="Rewrite" url="index.php" />
    … …  
    483486        ?>
    484487                <li><p><?php printf( __( 'Add the following to your <code>web.config</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
    485                 <textarea class="code" readonly="readonly" cols="100" rows="20">
    486                 <?php echo esc_textarea( $web_config_file ); ?>
     488                <?php
     489                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
     490                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
     491                ?>
     492                <textarea class="code" readonly="readonly" cols="100" rows="20"><?php echo esc_textarea( $web_config_file ); ?>
    487493                </textarea></li>
    488494                </ol>
    … …  
    492498                $htaccess_file = 'RewriteEngine On
    493499RewriteBase ' . $base . '
    494 RewriteRule ^index\.php$ - [L]
    495 
    496 # uploaded files
    497 RewriteRule ^' . ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n";
     500RewriteRule ^index\.php$ - [L]' . "\n";
     501
     502                if ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) {
     503                        $htaccess_file .= "\n# uploaded files\nRewriteRule ^";
     504                        $htaccess_file .= ( $subdomain_install ? '' : '([_0-9a-zA-Z-]+/)?' ) . 'files/(.+) wp-includes/ms-files.php?file=$' . ( $subdomain_install ? 1 : 2 ) . ' [L]' . "\n";
     505                }
    498506
    499507                if ( ! $subdomain_install )
    … …  
    512520                ?>
    513521                <li><p><?php printf( __( 'Add the following to your <code>.htaccess</code> file in <code>%s</code>, replacing other WordPress rules:' ), ABSPATH ); ?></p>
    514                 <textarea class="code" readonly="readonly" cols="100" rows="<?php echo $subdomain_install ? 11 : 16; ?>">
     522                <?php
     523                if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' )
     524                        echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
     525                ?>
     526                <textarea class="code" readonly="readonly" cols="100" rows="<?php echo substr_count( $htaccess_file, "\n" ) + 1; ?>">
    515527<?php echo esc_textarea( $htaccess_file ); ?></textarea></li>
    516528                </ol>

  • trunk/wp-includes/functions.php

    r21822 r21823  
    14331433 */
    14341434function wp_upload_dir( $time = null ) {
    1435         global $_wp_switched;
    14361435        $siteurl = get_option( 'siteurl' );
    1437         $upload_path = get_option( 'upload_path' );
    1438         $upload_path = trim($upload_path);
    1439         $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
    1440         if ( empty($upload_path) ) {
     1436        $upload_path = trim( get_option( 'upload_path' ) );
     1437
     1438        if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
    14411439                $dir = WP_CONTENT_DIR . '/uploads';
     1440        } elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
     1441                // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
     1442                $dir = path_join( ABSPATH, $upload_path );
    14421443        } else {
    14431444                $dir = $upload_path;
    1444                 if ( 'wp-content/uploads' == $upload_path ) {
    1445                         $dir = WP_CONTENT_DIR . '/uploads';
    1446                 } elseif ( 0 !== strpos($dir, ABSPATH) ) {
    1447                         // $dir is absolute, $upload_path is (maybe) relative to ABSPATH
    1448                         $dir = path_join( ABSPATH, $dir );
    1449                 }
    14501445        }
    14511446
    … …  
    14571452        }
    14581453
    1459         if ( defined('UPLOADS') && ! $main_override && ! $_wp_switched ) {
     1454        if ( defined( 'UPLOADS' ) ) {
    14601455                $dir = ABSPATH . UPLOADS;
    14611456                $url = trailingslashit( $siteurl ) . UPLOADS;
    14621457        }
    14631458
    1464         if ( is_multisite() && ! $main_override && ! $_wp_switched  ) {
    1465                 if ( defined( 'BLOGUPLOADDIR' ) )
    1466                         $dir = untrailingslashit(BLOGUPLOADDIR);
    1467                 $url = str_replace( UPLOADS, 'files', $url );
     1459        // Multisite (if not the main site in a post-MU network)
     1460        if ( is_multisite() && ! ( is_main_site() && defined( 'MULTISITE' ) ) ) {
     1461                if ( ! get_site_option( 'ms_files_rewriting' ) ) {
     1462                        // Append sites/%d if we're not on the main site (for post-MU networks).
     1463                        $ms_dir = '/sites/' . get_current_blog_id();
     1464                        $dir .= $ms_dir;
     1465                        $url .= $ms_dir;
     1466                } elseif ( ! ms_is_switched() ) {
     1467                        // Handle the old-form ms-files.php rewriting if the network still has that enabled.
     1468                        if ( defined( 'BLOGUPLOADDIR' ) )
     1469                                $dir = untrailingslashit( BLOGUPLOADDIR );
     1470                        $url = str_replace( UPLOADS, 'files', $url );
     1471                }
    14681472        }
    14691473

  • trunk/wp-includes/ms-default-constants.php

    r19712 r21823  
    1111 * Defines Multisite upload constants.
    1212 *
     13 * Exists for backward compatibility with legacy file-serving through
     14 * wp-includes/ms-files.php (wp-content/blogs.php in MU).
     15 *
    1316 * @since 3.0.0
    1417 */
    15 function ms_upload_constants(  ) {
     18function ms_upload_constants() {
    1619        global $wpdb;
     20
     21        if ( ! get_site_option( 'ms_files_rewriting' ) )
     22                return;
    1723
    1824        /** @since 3.0.0 */
    … …  
    2531                // Uploads dir relative to ABSPATH
    2632                define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
    27                 if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR )
     33                if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) )
    2834                        define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
    2935        }
    … …  
    7581 * Defines Multisite file constants.
    7682 *
     83 * Exists for backward compatibility with legacy file-serving through
     84 * wp-includes/ms-files.php (wp-content/blogs.php in MU).
     85 *
    7786 * @since 3.0.0
    7887 */
    79 function ms_file_constants(  ) {
     88function ms_file_constants() {
    8089        /**
    8190         * Optional support for X-Sendfile header

  • trunk/wp-includes/ms-default-filters.php

    r21256 r21823  
    6262remove_filter( 'option_siteurl', '_config_wp_siteurl' );
    6363remove_filter( 'option_home',    '_config_wp_home'    );
     64
     65// If the network upgrade hasn't run yet, assume ms-files.php rewriting is used.
     66add_filter( 'default_site_option_ms_files_rewriting', '__return_true' );

  • trunk/wp-includes/ms-functions.php

    r21664 r21823  
    11211121 */
    11221122function install_blog($blog_id, $blog_title = '') {
    1123         global $wpdb, $table_prefix, $wp_roles;
    1124         $wpdb->suppress_errors();
     1123        global $wpdb, $wp_roles, $current_site;
    11251124
    11261125        // Cast for security
    … …  
    11301129
    11311130        if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
    1132                 die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
    1133 
    1134         $wpdb->suppress_errors(false);
    1135 
    1136         $url = get_blogaddress_by_id($blog_id);
     1131                die( __( '<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>' ) . '</body></html>' );
     1132
     1133        $url = get_blogaddress_by_id( $blog_id );
    11371134
    11381135        // Set everything up
    … …  
    11431140
    11441141        $url = untrailingslashit( $url );
    1145         // fix url.
    1146         update_option('siteurl', $url);
    1147         update_option('home', $url);
    1148         update_option('fileupload_url', $url . "/files" );
    1149         update_option('upload_path', UPLOADBLOGSDIR . "/$blog_id/files");
    1150         update_option('blogname', stripslashes( $blog_title ) );
    1151         update_option('admin_email', '');
    1152         $wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') );
     1142
     1143        update_option( 'siteurl', $url );
     1144        update_option( 'home', $url );
     1145
     1146        if ( get_site_option( 'ms_files_rewriting' ) )
     1147                update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
     1148        else
     1149                update_option( 'upload_path', get_blog_option( $current_site->blog_id, 'upload_path' ) );
     1150
     1151        update_option( 'blogname', stripslashes( $blog_title ) );
     1152        update_option( 'admin_email', '' );
    11531153
    11541154        // remove all perms
    1155         $wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'user_level' ) );
    1156 
    1157         $wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'capabilities' ) );
    1158 
    1159         $wpdb->suppress_errors( false );
     1155        $table_prefix = $wpdb->get_blog_prefix();
     1156        delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
     1157        delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
    11601158}
    11611159

  • trunk/wp-includes/option.php

    r20784 r21823  
    175175                $site_id = $wpdb->siteid;
    176176
    177         $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled' );
     177        $core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
    178178
    179179        $core_options_in = "'" . implode("', '", $core_options) . "'";

  • trunk/wp-includes/rewrite.php

    r21819 r21823  
    17431743                        if (is_subdomain_install()) {
    17441744                                $rules .= '
    1745                                 <rule name="wordpress - Rule 1" stopProcessing="true">
     1745                                <rule name="WordPress Rule 1" stopProcessing="true">
    17461746                                        <match url="^index\.php$" ignoreCase="false" />
    17471747                                        <action type="None" />
    1748                                 </rule>
    1749                                 <rule name="wordpress - Rule 2" stopProcessing="true">
     1748                                </rule>';
     1749                                if ( get_site_option( 'ms_files_rewriting' ) ) {
     1750                                        $rules .= '
     1751                                <rule name="WordPress Rule for Files" stopProcessing="true">
    17501752                                        <match url="^files/(.+)" ignoreCase="false" />
    17511753                                        <action type="Rewrite" url="wp-includes/ms-files.php?file={R:1}" appendQueryString="false" />
    1752                                 </rule>
    1753                                 <rule name="wordpress - Rule 3" stopProcessing="true">
     1754                                </rule>';
     1755                                }
     1756                                $rules .= '
     1757                                <rule name="WordPress Rule 2" stopProcessing="true">
    17541758                                        <match url="^" ignoreCase="false" />
    17551759                                        <conditions logicalGrouping="MatchAny">
    … …  
    17591763                                        <action type="None" />
    17601764                                </rule>
    1761                                 <rule name="wordpress - Rule 4" stopProcessing="true">
     1765                                <rule name="WordPress Rule 3" stopProcessing="true">
    17621766                                        <match url="." ignoreCase="false" />
    17631767                                        <action type="Rewrite" url="index.php" />
    … …  
    17651769                        } else {
    17661770                                $rules .= '
    1767                                 <rule name="wordpress - Rule 1" stopProcessing="true">
     1771                                <rule name="WordPress Rule 1" stopProcessing="true">
    17681772                                        <match url="^index\.php$" ignoreCase="false" />
    17691773                                        <action type="None" />
    1770                                 </rule>
    1771                                 <rule name="wordpress - Rule 2" stopProcessing="true">
     1774                                </rule>';
     1775                                if ( get_site_option( 'ms_files_rewriting' ) ) {
     1776                                        $rules .= '
     1777                                <rule name="WordPress Rule for Files" stopProcessing="true">
    17721778                                        <match url="^([_0-9a-zA-Z-]+/)?files/(.+)" ignoreCase="false" />
    17731779                                        <action type="Rewrite" url="wp-includes/ms-files.php?file={R:2}" appendQueryString="false" />
    1774                                 </rule>
    1775                                 <rule name="wordpress - Rule 3" stopProcessing="true">
     1780                                </rule>';
     1781                                }
     1782                                $rules .= '
     1783                                <rule name="WordPress Rule 2" stopProcessing="true">
    17761784                                        <match url="^([_0-9a-zA-Z-]+/)?wp-admin$" ignoreCase="false" />
    17771785                                        <action type="Redirect" url="{R:1}wp-admin/" redirectType="Permanent" />
    17781786                                </rule>
    1779                                 <rule name="wordpress - Rule 4" stopProcessing="true">
     1787                                <rule name="WordPress Rule 3" stopProcessing="true">
    17801788                                        <match url="^" ignoreCase="false" />
    17811789                                        <conditions logicalGrouping="MatchAny">
    … …  
    17851793                                        <action type="None" />
    17861794                                </rule>
    1787                                 <rule name="wordpress - Rule 5" stopProcessing="true">
     1795                                <rule name="WordPress Rule 4" stopProcessing="true">
    17881796                                        <match url="^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*)" ignoreCase="false" />
    17891797                                        <action type="Rewrite" url="{R:1}" />
    17901798                                </rule>
    1791                                 <rule name="wordpress - Rule 6" stopProcessing="true">
     1799                                <rule name="WordPress Rule 5" stopProcessing="true">
    17921800                                        <match url="^([_0-9a-zA-Z-]+/)?(.*\.php)$" ignoreCase="false" />
    17931801                                        <action type="Rewrite" url="{R:2}" />
    17941802                                </rule>
    1795                                 <rule name="wordpress - Rule 7" stopProcessing="true">
     1803                                <rule name="WordPress Rule 6" stopProcessing="true">
    17961804                                        <match url="." ignoreCase="false" />
    17971805                                        <action type="Rewrite" url="index.php" />

  • trunk/wp-includes/version.php

    r21818 r21823  
    1212 * @global int $wp_db_version
    1313 */
    14 $wp_db_version = 21818;
     14$wp_db_version = 21823;
    1515
    1616/**
Note: See TracChangeset for help on using the changeset viewer.