WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move $base sanity check to from MS config template to ms-settings. see #11816 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-03-06 19:36:35 +00:00
parent b2c3ace49a
commit f210aed76d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/wp-config.ms
View File

@ -77,10 +77,6 @@ $table_prefix = 'wp_';
*/ */
define ('WPLANG', ''); define ('WPLANG', '');
// double check $base
if( $base == 'BASE' )
die( 'Problem in wp-config.php - $base is set to BASE when it should be the path like "/" or "/blogs/"! Please fix it!' );
// uncomment this to enable WP_CONTENT_DIR/sunrise.php support // uncomment this to enable WP_CONTENT_DIR/sunrise.php support
//define( 'SUNRISE', 'on' ); //define( 'SUNRISE', 'on' );

4
wp-includes/ms-settings.php
View File

@ -9,6 +9,10 @@
* @subpackage Multisite * @subpackage Multisite
*/ */
// $base sanity check.
if ( 'BASE' == $base )
die( 'Configuration error in <code>wp-config.php<code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".' );
/** Include Multisite initialization functions */ /** Include Multisite initialization functions */
require( ABSPATH . WPINC . '/ms-load.php' ); require( ABSPATH . WPINC . '/ms-load.php' );
require( ABSPATH . WPINC . '/ms-default-constants.php' ); require( ABSPATH . WPINC . '/ms-default-constants.php' );