Index: tests/ms.php
===================================================================
--- tests/ms.php	(revision 1294)
+++ tests/ms.php	(working copy)
@@ -841,19 +841,28 @@
 
 	/**
 	 * @ticket 21552
+	 * @ticket 23418
 	 */
 	function test_sanitize_ms_options() {
-		update_option( 'illegal_names', array( '', 'Woo', '' ) );
-		update_option( 'limited_email_domains', array(  'woo', '', 'boo.com', 'foo.net.biz..'  ) );
-		update_option( 'banned_email_domains', array(  'woo', '', 'boo.com', 'foo.net.biz..'  ) );
+		update_site_option( 'illegal_names', array( '', 'Woo', '' ) );
+		update_site_option( 'limited_email_domains', array(  'woo', '', 'boo.com', 'foo.net.biz..'  ) );
+		update_site_option( 'banned_email_domains', array(  'woo', '', 'boo.com', 'foo.net.biz..'  ) );
 
-		$this->assertEquals( array( 'Woo' ), get_option( 'illegal_names' ) );
-		$this->assertEquals( array( 'woo', 'boo.com' ), get_option( 'limited_email_domains' ) );
-		$this->assertEquals( array( 'woo', 'boo.com' ), get_option( 'banned_email_domains' ) );
+		$this->assertEquals( array( 'Woo' ), get_site_option( 'illegal_names' ) );
+		$this->assertEquals( array( 'woo', 'boo.com' ), get_site_option( 'limited_email_domains' ) );
+		$this->assertEquals( array( 'woo', 'boo.com' ), get_site_option( 'banned_email_domains' ) );
 
+		update_site_option( 'illegal_names', 'foo bar' );
+		update_site_option( 'limited_email_domains', "foo\nbar" );
+		update_site_option( 'banned_email_domains', "foo\nbar" );
+
+		$this->assertEquals( array( 'foo', 'bar' ), get_site_option( 'illegal_names' ) );
+		$this->assertEquals( array( 'foo', 'bar' ), get_site_option( 'limited_email_domains' ) );
+		$this->assertEquals( array( 'foo', 'bar' ), get_site_option( 'banned_email_domains' ) );
+
 		foreach ( array( 'illegal_names', 'limited_email_domains', 'banned_email_domains' ) as $option ) {
-			update_option( $option, array() );
-			$this->assertSame( '', get_option( $option ) );
+			update_site_option( $option, array() );
+			$this->assertSame( '', get_site_option( $option ) );
 		}
 	}