Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php	(revision 24312)
+++ wp-includes/media.php	(working copy)
@@ -2369,20 +2369,20 @@
 }
 
 /**
- * Check a specified post's content for gallery and, if present, return the first
+ * Check a specified post's content for gallery and, if present, return the first.
  *
  * @since 3.6.0
  *
  * @param int $post_id Optional. Post ID.
- * @param boolean $html Whether to return HTML or data
- * @return array Gallery data and srcs parsed from the expanded shortcode
+ * @param boolean $html Whether to return HTML or data.
+ * @return string|array Gallery html or data and srcs parsed from the expanded shortcode.
  */
 function get_post_gallery( $post_id = 0, $html = true ) {
 	if ( ! $post = get_post( $post_id ) )
-		return array();
+		return $html ? '' : array();
 
 	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
-		return array();
+		return $html ? '' : array();
 
 	$data = get_content_galleries( $post->post_content, $html, false, 1 );
 	return reset( $data );