From 7c8538256d826b0fa403ab3b214da90cf9191a2d Mon Sep 17 00:00:00 2001 From: nacin Date: Fri, 29 Oct 2010 22:44:05 +0000 Subject: [PATCH] Prevent network creation when OMG_DO_NOT_UPGRADE_GLOBAL_TABLES is defined. props wpmuguru, fixes #14246. git-svn-id: http://svn.automattic.com/wordpress/trunk@16094 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wp-admin/network.php b/wp-admin/network.php index 7d6c78855..b78fb73e4 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -130,6 +130,13 @@ function network_step1( $errors = false ) { die(); } + if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) { + echo '

' . __('Error:') . ' ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '

'; + echo ''; + include ('./admin-footer.php' ); + die(); + } + $active_plugins = get_option( 'active_plugins' ); if ( ! empty( $active_plugins ) ) { echo '

' . __('Warning:') . ' ' . sprintf( __( 'Please deactivate your plugins before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '

' . __( 'Once the network is created, you may reactivate your plugins.' ) . '

';