Don't return if is_string(). Proceed to check if is_serialized(). fixes #7347 for trunk

git-svn-id: http://svn.automattic.com/wordpress/trunk@8372 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/functions.php

@@ -630,12 +630,12 @@ function delete_option( $name ) {
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_string( $data ) )
-		return $data;
-	elseif ( is_array( $data ) || is_object( $data ) )
+	if ( is_array( $data ) || is_object( $data ) )
 		return serialize( $data );
+
 	if ( is_serialized( $data ) )
 		return serialize( $data );
+
 	return $data;
 }