<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[36569] trunk/src: Replace `wp_upload_dir()` with the new `wp_get_upload_dir()` in all cases where a file is not being uploaded.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/36569">36569</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/36569","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-18 00:23:04 +0000 (Thu, 18 Feb 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Replace `wp_upload_dir()` with the new `wp_get_upload_dir()` in all cases where a file is not being uploaded. Deprecate `_wp_upload_dir_baseurl()`, and replace it with `wp_get_upload_dir()`.
See <a href="https://core.trac.wordpress.org/ticket/34359">#34359</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-admin/includes/ms.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $drop ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploads = wp_upload_dir();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads = wp_get_upload_dir();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tables = $wpdb->tables( 'blog' );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-includes/comment.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2205,7 +2205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //Do not search for a pingback server on our own uploads
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploads_dir = wp_upload_dir();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_dir = wp_get_upload_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos($url, $uploads_dir['baseurl']) )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-includes/deprecated.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3716,3 +3716,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
</span><span class="cx" style="display: block; padding: 0 10px"> return $text;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Returns the base URL of the uploads directory.
+ *
+ * @since 4.4.0
+ * @access private
+ * @deprecated 4.5.0
+ *
+ * @return string The base URL.
+ */
+function _wp_upload_dir_baseurl() {
+ $upload_dir = wp_get_upload_dir();
+ return $upload_dir['baseurl'];
+}
</ins></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-includes/functions.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1885,7 +1885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tested_paths[ $path ] = $uploads['error'];
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-includes/media.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,27 +903,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Caches and returns the base URL of the uploads directory.
- *
- * @since 4.4.0
- * @access private
- *
- * @return string The base URL, cached.
- */
-function _wp_upload_dir_baseurl() {
- static $baseurl = array();
-
- $blog_id = get_current_blog_id();
-
- if ( empty( $baseurl[$blog_id] ) ) {
- $uploads_dir = wp_upload_dir();
- $baseurl[$blog_id] = $uploads_dir['baseurl'];
- }
-
- return $baseurl[$blog_id];
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Get the image size as array from its meta data.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Used for responsive images.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,8 +1024,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dirname = trailingslashit( $dirname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_baseurl = _wp_upload_dir_baseurl();
- $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upload_dir = wp_get_upload_dir();
+ $image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Images that have been edited in WordPress after being uploaded will
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3739,7 +3718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function attachment_url_to_postid( $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dir = wp_upload_dir();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dir = wp_get_upload_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = $url;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_url = parse_url( $dir['url'] );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2016-02-18 00:13:21 UTC (rev 36568)
+++ trunk/src/wp-includes/post.php 2016-02-18 00:23:04 UTC (rev 36569)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,11 +186,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attached_file( $attachment_id, $unfiltered = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = get_post_meta( $attachment_id, '_wp_attached_file', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the file is relative, prepend upload dir.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file && 0 !== strpos($file, '/') && !preg_match('|^.:\\\|', $file) && ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = $uploads['basedir'] . "/$file";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $unfiltered )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( $unfiltered ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $file;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the attached file based on the given ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_relative_upload_path( $path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = $path;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploads = wp_upload_dir();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads = wp_get_upload_dir();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = str_replace( $uploads['basedir'], '', $new_path );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = ltrim( $new_path, '/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4847,7 +4851,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deleted_post', $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $uploadpath = wp_upload_dir();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploadpath = wp_get_upload_dir();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($meta['thumb']) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't delete the thumb if another attachment uses it.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4964,9 +4968,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> // Get attached file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get upload directory.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check that the upload base exists in the file location.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace file location with url location.
</span></span></pre>
</div>
</div>
</body>
</html>