IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Every time you nest a ternary operator, a kitten dies.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin
2010-11-18 05:37:00 +00:00
parent 8efb005a73
commit 27c21a741e
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/network.php
View File

@@ -25,7 +25,7 @@ if ( is_multisite() ) {
}
if ( ! defined( 'MULTISITE' ) )
wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
}
}
// We need to create references to ms global tables to enable Network.
foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
@@ -312,7 +312,10 @@ function network_step2( $errors = false ) {
echo '<div class="error">' . $errors->get_error_message() . '</div>';
if ( $_POST ) {
$subdomain_install = allow_subdomain_install() ? ( allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
if ( allow_subdomain_install() )
$subdomain_install = allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true;
else
$subdomain_install = false;
} else {
if ( is_multisite() ) {
$subdomain_install = is_subdomain_install();