Index: /Users/simon/Projects/SeedsmanAggregator/site/wordpress/wp-includes/functions.php
===================================================================
--- /Users/simon/Projects/SeedsmanAggregator/site/wordpress/wp-includes/functions.php	(revision 11790)
+++ /Users/simon/Projects/SeedsmanAggregator/site/wordpress/wp-includes/functions.php	(working copy)
@@ -2070,7 +2070,7 @@
 	// Make sure we have an uploads dir
 	if ( ! wp_mkdir_p( $uploads['path'] ) ) {
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $uploads['path'] );
-		return array( 'error' => $message );
+		return new WP_Error( 'upload_dir', $message );
 	}
 
 	return $uploads;