From cf8e9c752abcb92ada7df19fcf241db56ad919b9 Mon Sep 17 00:00:00 2001
From: wpmuguru <wpmuguru@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 8 May 2010 18:37:38 +0000
Subject: [PATCH] don't allow blog sub site in folder install, see #13304
git-svn-id: http://svn.automattic.com/wordpress/trunk@14516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
wp-admin/includes/schema.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 5a8e40cea6..098b4ff291 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -710,6 +710,8 @@ Thanks!
'subdomain_install' => intval( $subdomain_install ),
'global_terms_enabled' => global_terms_enabled() ? '1' : '0'
);
+ if ( !intval( $subdomain_install ) )
+ $sitemeta['illegal_names'][] = 'blog';
$insert = '';
foreach ( $sitemeta as $meta_key => $meta_value ) {