From f6a528fcff7ee7687fcbe7876f140d46648fbb41 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 12 Sep 2006 14:47:22 +0000
Subject: Site admin list should be space separated (fixed #117)

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@741 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/wpmu-edit.php    | 2 +-
 wp-admin/wpmu-options.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'wp-admin')

diff --git a/wp-admin/wpmu-edit.php b/wp-admin/wpmu-edit.php
index abf2732..75cf095 100644
--- a/wp-admin/wpmu-edit.php
+++ b/wp-admin/wpmu-edit.php
@@ -33,7 +33,7 @@ switch( $_REQUEST[ 'action' ] ) {
 		update_site_option( "first_post", $_POST[ 'first_post' ] );
 		update_site_option( "welcome_email", $_POST[ 'welcome_email' ] );
 		update_site_option( "fileupload_maxk", $_POST[ 'fileupload_maxk' ] );
-		$site_admins = explode( ' ', $_POST['site_admins'] );
+		$site_admins = explode( ' ', str_replace( ",", " ", $_POST['site_admins'] ) );
 		if ( is_array( $site_admins ) ) {
 			$mainblog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
 			if( $mainblog_id ) {
diff --git a/wp-admin/wpmu-options.php b/wp-admin/wpmu-options.php
index 676667d..76827de 100644
--- a/wp-admin/wpmu-options.php
+++ b/wp-admin/wpmu-options.php
@@ -78,7 +78,7 @@ if (isset($_GET['updated'])) {
 		<th scope="row"><?php _e('Site Admins:') ?></th> 
 		<td><input name="site_admins" type="text" id="site_admins" style="width: 95%" value="<?php echo implode( " ", get_site_option( 'site_admins', array( 'admin' ) ) ) ?>" size="45" />
 		<br />
-		<?php _e('These users may login to the main blog and administer the site.') ?></td> 
+		<?php _e('These users may login to the main blog and administer the site. Space separated list of usernames.') ?></td> 
 		</tr> 
 		</table>
 	</fieldset>
-- 
cgit