From 68a67a9b0d8d0ba8dc8f28476b7a47e91cd769df Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 3 Nov 2014 02:27:23 +0000
Subject: [PATCH] Fix the return docs for `WP_Embed->maybe_make_link()`.

See #30224.

Built from https://develop.svn.wordpress.org/trunk@30178


git-svn-id: http://core.svn.wordpress.org/trunk@30178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-embed.php | 2 +-
 wp-includes/version.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/class-wp-embed.php b/wp-includes/class-wp-embed.php
index e8d25ffb1d..23a8289939 100644
--- a/wp-includes/class-wp-embed.php
+++ b/wp-includes/class-wp-embed.php
@@ -334,7 +334,7 @@ class WP_Embed {
 	 * Conditionally makes a hyperlink based on an internal class variable.
 	 *
 	 * @param string $url URL to potentially be linked.
-	 * @return string Linked URL or the original URL.
+	 * @return string|bool Linked URL or the original URL. False if 'return_false_on_fail' is true.
 	 */
 	public function maybe_make_link( $url ) {
 		if ( $this->return_false_on_fail ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eaf891686f..585062cd8b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30177';
+$wp_version = '4.1-alpha-30178';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.