From c26f1d7a3aa0424a96f2d2f7dbb31382136ed37e Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 13 Mar 2008 15:46:53 +0000
Subject: Minor changes, fixes #554, props momo360modena

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1206 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/wpmu-functions.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'wp-includes')

diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index cbb5ae3..78c7819 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -1652,7 +1652,6 @@ endif;
 /* Delete blog */
 
 class delete_blog {
-
 	function delete_blog() {
 		$this->reallydeleteblog = false;
 		add_action('admin_menu', array(&$this, 'admin_menu'));
@@ -1812,7 +1811,7 @@ function add_switcher() {
 	?>
 	<script type="text/javascript">
 	<!--
-	document.getElementById('wphead').innerHTML = '<?php echo $out ?>'
+	document.getElementById('wphead').innerHTML = '<?php echo $out ?>';
 	-->
 	</script>
 	<?php
@@ -1873,9 +1872,7 @@ function redirect_this_site( $hosts ) {
 add_filter( 'allowed_redirect_hosts', 'redirect_this_site' );
 
 function upload_is_file_too_big( $upload ) {
-	if( is_array( $upload ) == false )
-		return $upload;
-	if( defined( 'WP_IMPORTING' ) )
+	if( is_array( $upload ) == false || defined( 'WP_IMPORTING' ) )
 		return $upload;
 	if( strlen( $upload[ 'bits' ] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf(__( "This file is too big. Files must be less than %dKb in size.<br />" ), get_site_option( 'fileupload_maxk', 1500 )); 
-- 
cgit