Permalink
Browse files

Improve the implementation of the default constant defining functions…

… for multisite. See #11881.

git-svn-id: http://svn.automattic.com/wordpress/trunk@13065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 0206ffe commit b20c3c41d4ad31ffa216d59d65f011344b8e5375 westi committed Feb 12, 2010
Showing with 77 additions and 61 deletions.
  1. +73 −58 wp-includes/ms-default-constants.php
  2. +1 −1 wp-includes/ms-files.php
  3. +1 −1 wp-includes/ms-settings.php
  4. +2 −1 wp-settings.php
View
131 wp-includes/ms-default-constants.php
@@ -7,67 +7,82 @@
*/
/**
- * Defines Multisite default constants.
+ * Defines Multisite upload constants.
*
* @since 3.0.0
- * @param $context
*/
-function ms_default_constants( $context ) {
- switch( $context ) {
- case 'uploads' :
- global $wpdb;
- /** @since 3.0.0 */
- if ( !defined( 'UPLOADBLOGSDIR' ) )
- define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
- /** @since 3.0.0 */
- if ( !defined( 'UPLOADS' ) )
- define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
- /** @since 3.0.0 */
- if ( !defined( 'BLOGUPLOADDIR' ) )
- define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
- break;
- case 'cookies' :
- global $current_site;
- /**
- * @since 1.2.0
- */
- if ( !defined( 'COOKIEPATH' ) )
- define( 'COOKIEPATH', $current_site->path );
- /**
- * @since 1.5.0
- */
- if ( !defined( 'SITECOOKIEPATH' ) )
- define( 'SITECOOKIEPATH', $current_site->path );
- /**
- * @since 2.6.0
- */
- if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
- if( !is_subdomain_install() ) {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
- } else {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
- }
- }
- /**
- * @since 2.0.0
- */
- if ( !defined('COOKIE_DOMAIN') )
- define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
- break;
- case 'ms-files' :
- /**
- * Optional support for X-Sendfile header
- * @since 3.0.0
- */
- if ( !defined( 'WPMU_SENDFILE' ) )
- define( 'WPMU_SENDFILE', false );
- /**
- * Optional support for X-Accel-Redirect header
- * @since 3.0.0
- */
- if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
- define( 'WPMU_ACCEL_REDIRECT', false );
- break;
+function ms_upload_constants( ) {
+ global $wpdb;
+
+ /** @since 3.0.0 */
+ if ( !defined( 'UPLOADBLOGSDIR' ) )
+ define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
+
+ /** @since 3.0.0 */
+ if ( !defined( 'UPLOADS' ) )
+ define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
+
+ /** @since 3.0.0 */
+ if ( !defined( 'BLOGUPLOADDIR' ) )
+ define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
+}
+
+/**
+ * Defines Multisite cookie constants.
+ *
+ * @since 3.0.0
+ */
+function ms_cookie_constants( ) {
+ global $current_site;
+
+ /**
+ * @since 1.2.0
+ */
+ if ( !defined( 'COOKIEPATH' ) )
+ define( 'COOKIEPATH', $current_site->path );
+
+ /**
+ * @since 1.5.0
+ */
+ if ( !defined( 'SITECOOKIEPATH' ) )
+ define( 'SITECOOKIEPATH', $current_site->path );
+
+ /**
+ * @since 2.6.0
+ */
+ if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
+ if( !is_subdomain_install() ) {
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+ } else {
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+ }
}
+
+ /**
+ * @since 2.0.0
+ */
+ if ( !defined('COOKIE_DOMAIN') )
+ define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+}
+
+/**
+ * Defines Multisite file constants.
+ *
+ * @since 3.0.0
+ */
+function ms_file_constants( ) {
+ /**
+ * Optional support for X-Sendfile header
+ * @since 3.0.0
+ */
+ if ( !defined( 'WPMU_SENDFILE' ) )
+ define( 'WPMU_SENDFILE', false );
+
+ /**
+ * Optional support for X-Accel-Redirect header
+ * @since 3.0.0
+ */
+ if ( !defined( 'WPMU_ACCEL_REDIRECT' ) )
+ define( 'WPMU_ACCEL_REDIRECT', false );
}
?>
View
2 wp-includes/ms-files.php
@@ -13,7 +13,7 @@
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
}
-ms_default_constants( 'ms-files' );
+ms_file_constants( );
error_reporting( 0 );
View
2 wp-includes/ms-settings.php
@@ -124,6 +124,6 @@
wp_start_object_cache();
// Define upload directory constants
-ms_default_constants( 'uploads' );
+ms_upload_constants( );
?>
View
3 wp-settings.php
@@ -150,7 +150,8 @@
die();
}
unset($file);
- ms_default_constants( 'cookies' );
+
+ ms_cookie_constants( );
}
// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().

0 comments on commit b20c3c4

Please sign in to comment.