From 820d7174c230a14664f4a97a7251d97526853455 Mon Sep 17 00:00:00 2001
From: Joe McGill <joemcgill@gmail.com>
Date: Fri, 10 Jun 2016 16:52:30 +0000
Subject: [PATCH] Media: remove `_wp_upload_dir_baseurl()`.

`_wp_upload_dir_baseurl()` is a private function introduced in 4.4
as part of the "responsive images" feature. It was for runtime
caching of the URL to the uploads directory. It is deprecated in
4.5 with the introduction of `wp_get_upload_dir()`.

Outside core, it's only used as part of a back-compat shim in the
original feature plugin for responsive images (ricg-responsive-images),
which includes its own version of the function definition, so it's
safe to remove from core.

Fixes #36375.
Built from https://develop.svn.wordpress.org/trunk@37676


git-svn-id: http://core.svn.wordpress.org/trunk@37642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/deprecated.php | 18 ------------------
 wp-includes/version.php    |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index a931ce859c..f3a95c521b 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -3740,21 +3740,3 @@ function popuplinks( $text ) {
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }
-
-/**
- * Returns the base URL of the uploads directory.
- * Note: this function will be removed in 4.6.
- *
- * @ignore
- * @since 4.4.0
- * @access private
- * @deprecated 4.5.0 Use wp_get_upload_dir()
- * @see wp_get_upload_dir()
- *
- * @return string The base URL.
- */
-function _wp_upload_dir_baseurl() {
-	_deprecated_function( __FUNCTION__, '4.5', 'wp_get_upload_dir()' );
-	$upload_dir = wp_get_upload_dir();
-	return $upload_dir['baseurl'];
-}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 019792b74a..11fc71db1c 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37675';
+$wp_version = '4.6-alpha-37676';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.