From fc131b5ca670abb5c2658c96fdb8a07170ca58e9 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 11 Jun 2010 16:38:11 +0000
Subject: [PATCH] Add a constant for allow_subdirectory_install as conventional
 plugins have to be disabled on network.php. fixes #13844.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15225 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wp-admin/network.php b/wp-admin/network.php
index 7458bedf7..a2951641f 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -62,6 +62,9 @@ function allow_subdirectory_install() {
 	if ( apply_filters( 'allow_subdirectory_install', false ) )
 		return true;
 
+	if ( defined( 'ALLOW_SUBDIRECTORY_INSTALL' ) && ALLOW_SUBDIRECTORY_INSTALL )
+		return true;
+
 	$post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
 	if ( empty( $post ) )
 		return true;