26 // Base uploads dir relative to ABSPATH. |
26 // Base uploads dir relative to ABSPATH. |
27 if ( ! defined( 'UPLOADBLOGSDIR' ) ) { |
27 if ( ! defined( 'UPLOADBLOGSDIR' ) ) { |
28 define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' ); |
28 define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' ); |
29 } |
29 } |
30 |
30 |
31 // Note, the main site in a post-MU network uses wp-content/uploads. |
31 /* |
32 // This is handled in wp_upload_dir() by ignoring UPLOADS for this case. |
32 * Note, the main site in a post-MU network uses wp-content/uploads. |
|
33 * This is handled in wp_upload_dir() by ignoring UPLOADS for this case. |
|
34 */ |
33 if ( ! defined( 'UPLOADS' ) ) { |
35 if ( ! defined( 'UPLOADS' ) ) { |
34 $site_id = get_current_blog_id(); |
36 $site_id = get_current_blog_id(); |
35 |
37 |
36 define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' ); |
38 define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' ); |
37 |
39 |
141 '<code>VHOST</code>', |
143 '<code>VHOST</code>', |
142 '<code>SUBDOMAIN_INSTALL</code>', |
144 '<code>SUBDOMAIN_INSTALL</code>', |
143 '<code>wp-config.php</code>', |
145 '<code>wp-config.php</code>', |
144 '<code>is_subdomain_install()</code>' |
146 '<code>is_subdomain_install()</code>' |
145 ); |
147 ); |
|
148 |
146 if ( $subdomain_error_warn ) { |
149 if ( $subdomain_error_warn ) { |
147 trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING ); |
150 wp_trigger_error( |
|
151 __FUNCTION__, |
|
152 sprintf( |
|
153 /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL */ |
|
154 __( '<strong>Conflicting values for the constants %1$s and %2$s.</strong> The value of %2$s will be assumed to be your subdomain configuration setting.' ), |
|
155 '<code>VHOST</code>', |
|
156 '<code>SUBDOMAIN_INSTALL</code>' |
|
157 ) . ' ' . $vhost_deprecated, |
|
158 E_USER_WARNING |
|
159 ); |
148 } else { |
160 } else { |
149 _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated ); |
161 _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated ); |
150 } |
162 } |
|
163 |
151 return; |
164 return; |
152 } |
165 } |
153 |
166 |
154 if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) { |
167 if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) { |
155 $subdomain_error = true; |
168 $subdomain_error = true; |