summaryrefslogtreecommitdiffstats
path: root/wpmu-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-03 10:12:03 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-07-03 10:12:03 +0000
commitb2de68d3880512e5158eaaba1332136a8bee64aa (patch)
tree16f2d52ddfc60bd14e9d77e97cf4bc8d3a8e0d0e /wpmu-settings.php
parente827152b19208f7110b2392f30f84285c6309e90 (diff)
downloadwordpress-mu-b2de68d3880512e5158eaaba1332136a8bee64aa.tar.gz
wordpress-mu-b2de68d3880512e5158eaaba1332136a8bee64aa.tar.xz
wordpress-mu-b2de68d3880512e5158eaaba1332136a8bee64aa.zip
Added "wp-content" to the ignore list. Should allow php scripts in the plugins dir to be called directly
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@625 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wpmu-settings.php')
-rw-r--r--wpmu-settings.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/wpmu-settings.php b/wpmu-settings.php
index 31c8d83..7504b9c 100644
--- a/wpmu-settings.php
+++ b/wpmu-settings.php
@@ -64,7 +64,8 @@ if( constant( 'VHOST' ) == 'yes' ) {
$blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
if( strpos( $blogname, '?' ) )
$blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
- if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'wp-includes' || $blogname == 'files' || $blogname == 'feed' || is_file( $blogname ) ) {
+ $blognames = array( 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
+ if( $blogname == '' || in_array( $blogname, $blognames ) || is_file( $blogname ) ) {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");
} else {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '{$path}{$blogname}/'");