Permalink
Browse files

Fix UPLOADS constant. fixes #14840 for the 3.0 branch.

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@15995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 264ce30 commit e0423e924f83e29765c9977e15d62ebd32ba0d02 nacin committed Oct 27, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 wp-includes/functions.php
@@ -2125,7 +2125,7 @@ function wp_upload_dir( $time = null ) {
$siteurl = get_option( 'siteurl' );
$upload_path = get_option( 'upload_path' );
$upload_path = trim($upload_path);
- $main_override = defined( 'MULTISITE' ) && is_main_site();
+ $main_override = is_multisite() && defined( 'MULTISITE' ) && is_main_site();
if ( empty($upload_path) ) {
$dir = WP_CONTENT_DIR . '/uploads';
} else {

0 comments on commit e0423e9

Please sign in to comment.