sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dont define BLOGUPLOADDIR if UPLOADS is defined, see #12558

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13632 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ron Rennick 2010-03-09 18:19:28 +00:00
parent 29e618f33a
commit 59fe0e60fa
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/ms-default-constants.php
View File

@ -15,17 +15,18 @@ function ms_upload_constants( ) {
global $wpdb; global $wpdb;
/** @since 3.0.0 */ /** @since 3.0.0 */
// Base uploads dir relative to ABSPATH
if ( !defined( 'UPLOADBLOGSDIR' ) ) if ( !defined( 'UPLOADBLOGSDIR' ) )
define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' ); define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
/** @since 3.0.0 */ /** @since 3.0.0 */
if ( !defined( 'UPLOADS' ) ) if ( !defined( 'UPLOADS' ) ) {
// Uploads dir relative to ABSPATH
define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" ); define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR )
/** @since 3.0.0 */
if ( !defined( 'BLOGUPLOADDIR' ) )
define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" ); define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
} }
}
/** /**
* Defines Multisite cookie constants. * Defines Multisite cookie constants.