<!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>[BuddyPress][10194] trunk: Allow class extending the `BP_Attachment` class to get the original WordPress upload dir within their `upload_dir_filter()` method.</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="http://buddypress.trac.wordpress.org/changeset/10194">10194</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10194","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-06 23:53:33 +0000 (Tue, 06 Oct 2015)</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'>Allow class extending the `BP_Attachment` class to get the original WordPress upload dir within their `upload_dir_filter()` method.
To do so, you simply need to add the argument `$upload_dir_filter_args` to the array you use inside your constructor and set it to 1.
Props rittesh.patel
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6591">#6591</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreclassesclassbpattachmentcoverimagephp">trunk/src/bp-core/classes/class-bp-attachment-cover-image.php</a></li>
<li><a href="#trunksrcbpcoreclassesclassbpattachmentphp">trunk/src/bp-core/classes/class-bp-attachment.php</a></li>
<li><a href="#trunktestsphpunitassetsattachmentextensionsphp">trunk/tests/phpunit/assets/attachment-extensions.php</a></li>
<li><a href="#trunktestsphpunittestcasescoreclassbpattachmentphp">trunk/tests/phpunit/testcases/core/class-bp-attachment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreclassesclassbpattachmentcoverimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-attachment-cover-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-attachment-cover-image.php 2015-10-06 23:17:06 UTC (rev 10193)
+++ trunk/src/bp-core/classes/class-bp-attachment-cover-image.php 2015-10-06 23:53:33 UTC (rev 10194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,9 +93,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $upload_dir The original Uploads dir.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array upload data (path, url, basedir...)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function upload_dir_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function upload_dir_filter( $upload_dir = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Default values are for profiles
</span><span class="cx" style="display: block; padding: 0 10px"> $object_id = bp_displayed_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,14 +115,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the subdir
</span><span class="cx" style="display: block; padding: 0 10px"> $subdir = '/' . $object_directory . '/' . $object_id . '/cover-image';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_attachments_cover_image_upload_datas', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Filters the cover image upload directory.
+ *
+ * @since 2.4.0
+ *
+ * @param array $value Array containing the path, URL, and other helpful settings.
+ * @param array $upload_dir The original Uploads dir.
+ */
+ return apply_filters( 'bp_attachments_cover_image_upload_dir', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'path' => $this->upload_path . $subdir,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $this->url . $subdir,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subdir' => $subdir,
</span><span class="cx" style="display: block; padding: 0 10px"> 'basedir' => $this->upload_path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'baseurl' => $this->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => false
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ), $upload_dir );
</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"> /**
</span></span></pre></div>
<a id="trunksrcbpcoreclassesclassbpattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-attachment.php 2015-10-06 23:17:06 UTC (rev 10193)
+++ trunk/src/bp-core/classes/class-bp-attachment.php 2015-10-06 23:53:33 UTC (rev 10194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,30 +34,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected $default_args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'original_max_filesize' => 0,
- 'allowed_mime_types' => array(),
- 'base_dir' => '',
- 'action' => '',
- 'file_input' => '',
- 'upload_error_strings' => array(),
- 'required_wp_files' => array( 'file' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'original_max_filesize' => 0,
+ 'allowed_mime_types' => array(),
+ 'base_dir' => '',
+ 'action' => '',
+ 'file_input' => '',
+ 'upload_error_strings' => array(),
+ 'required_wp_files' => array( 'file' ),
+ 'upload_dir_filter_args' => 0,
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Construct Upload parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.4.0 Add the $upload_dir_filter_args argument to the $arguments array
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array|string $args {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type int $original_max_filesize Maximum file size in kilobytes. Defaults to php.ini settings.
- * @type array $allowed_mime_types List of allowed file extensions (eg: array( 'jpg', 'gif', 'png' ) ).
- * Defaults to WordPress allowed mime types.
- * @type string $base_dir Component's upload base directory. Defaults to WordPress 'uploads'.
- * @type string $action The upload action used when uploading a file, $_POST['action'] must be set
- * and its value must equal $action {@link wp_handle_upload()} (required).
- * @type string $file_input The name attribute used in the file input. (required).
- * @type array $upload_error_strings A list of specific error messages (optional).
- * @type array $required_wp_files The list of required WordPress core files. Default: array( 'file' ).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type int $original_max_filesize Maximum file size in kilobytes. Defaults to php.ini settings.
+ * @type array $allowed_mime_types List of allowed file extensions (eg: array( 'jpg', 'gif', 'png' ) ).
+ * Defaults to WordPress allowed mime types.
+ * @type string $base_dir Component's upload base directory. Defaults to WordPress 'uploads'.
+ * @type string $action The upload action used when uploading a file, $_POST['action'] must be set
+ * and its value must equal $action {@link wp_handle_upload()} (required).
+ * @type string $file_input The name attribute used in the file input. (required).
+ * @type array $upload_error_strings A list of specific error messages (optional).
+ * @type array $required_wp_files The list of required WordPress core files. Default: array( 'file' ).
+ * @type int $upload_dir_filter_args 1 to receive the original Upload dir array in the Upload dir filter, 0 otherwise.
+ * Defaults to 0 (optional).
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses sanitize_key()
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wp_max_upload_size()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,6 +95,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'base_dir' === $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->{$key} = sanitize_title( $param );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sanitize the upload dir filter arg to pass
+ } elseif ( 'upload_dir_filter_args' === $key ) {
+ $this->{$key} = (int) $param;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Action & File input are already set and sanitized
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'action' !== $key && 'file_input' !== $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->{$key} = $param;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the file will be uploaded in the attachment directory
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $upload_dir_filter ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'upload_dir', $upload_dir_filter, 10, $this->upload_dir_filter_args );
</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"> // Upload the attachment
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +284,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Restore WordPress Uploads data
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $upload_dir_filter ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'upload_dir', $upload_dir_filter, 10, $this->upload_dir_filter_args );
</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"> // Remove the pre WordPress 4.0 static filter
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,20 +353,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default filter to save the attachments.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.4.0 Add the $upload_dir parameter to the method
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses apply_filters() call 'bp_attachment_upload_dir' to eventually override the upload location
</span><span class="cx" style="display: block; padding: 0 10px"> * regarding to context
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $upload_dir The original Uploads dir.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The upload directory data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function upload_dir_filter() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function upload_dir_filter( $upload_dir = array() ) {
</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"> * Filters the component's upload directory.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.4.0 Include the original Upload directory as the second parameter of the filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $value Array containing the path, URL, and other helpful settings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $value Array containing the path, URL, and other helpful settings.
+ * @param array $upload_dir The original Uploads dir.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'bp_attachment_upload_dir', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => $this->upload_path,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'basedir' => $this->upload_path,
</span><span class="cx" style="display: block; padding: 0 10px"> 'baseurl' => $this->url,
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => false
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ), $upload_dir );
</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"> /**
</span></span></pre></div>
<a id="trunktestsphpunitassetsattachmentextensionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/assets/attachment-extensions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/assets/attachment-extensions.php 2015-10-06 23:17:06 UTC (rev 10193)
+++ trunk/tests/phpunit/assets/attachment-extensions.php 2015-10-06 23:53:33 UTC (rev 10194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,4 +7,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return parent::__construct( $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function upload_dir_filter( $upload_dir = array() ) {
+ $this->original_upload_dir = $upload_dir;
+
+ return parent::upload_dir_filter( $upload_dir );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasescoreclassbpattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/core/class-bp-attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/core/class-bp-attachment.php 2015-10-06 23:17:06 UTC (rev 10193)
+++ trunk/tests/phpunit/testcases/core/class-bp-attachment.php 2015-10-06 23:53:33 UTC (rev 10194)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,18 +12,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function setUp() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::setUp();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ), 10, 1 );
- add_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ), 10, 1 );
+ add_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+ add_filter( 'bp_attachments_cover_image_upload_dir', array( $this, 'filter_cover_image_dir' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upload_results = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image_file = trailingslashit( buddypress()->plugin_dir ) . 'bp-core/images/mystery-man.jpg';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->original_upload_dir = array();
</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"> public function tearDown() {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tearDown();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ), 10, 1 );
- remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'bp_attachment_upload_overrides', array( $this, 'filter_overrides' ), 10, 1 );
+ remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+ add_filter( 'bp_attachments_cover_image_upload_dir', array( $this, 'filter_cover_image_dir' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->upload_results = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image_file = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->original_upload_dir = array();
</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"> public function filter_overrides( $overrides ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,6 +49,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $upload_dir;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function filter_cover_image_dir( $cover_dir, $upload_dir ) {
+ $this->original_upload_dir = $upload_dir;
+
+ return $cover_dir;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * To avoid copying files in tests, we're faking a succesfull uploads
</span><span class="cx" style="display: block; padding: 0 10px"> * as soon as all the test_form have been executed in _wp_handle_upload
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,4 +463,55 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( 3 === $image_data['meta']['orientation'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group upload
+ * @group cover_images
+ */
+ public function test_bp_attachment_upload_dir_filter_arg() {
+ $reset_files = $_FILES;
+ $reset_post = $_POST;
+
+ $attachment_class = new BPTest_Attachment_Extension( array(
+ 'action' => 'attachment_action',
+ 'file_input' => 'attachment_file_input',
+ 'base_dir' => 'attachment_base_dir',
+ 'upload_dir_filter_args' => 1,
+ ) );
+
+ $_POST['action'] = $attachment_class->action;
+ $_FILES[ $attachment_class->file_input ] = array(
+ 'tmp_name' => $this->image_file,
+ 'name' => 'mystery-man.jpg',
+ 'type' => 'image/jpeg',
+ 'error' => 0,
+ 'size' => filesize( $this->image_file ),
+ );
+
+ // Simulate an upload
+ $attachment_class->upload( $_FILES );
+
+ // Remove the filter used to fake uploads
+ remove_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+
+ $this->assertSame( $attachment_class->original_upload_dir, wp_upload_dir() );
+
+ // Restore the filter used to fake uploads
+ add_filter( 'upload_dir', array( $this, 'filter_upload_dir' ), 20, 1 );
+
+ $this->assertTrue( 1 === $attachment_class->upload_dir_filter_args );
+
+ $cover_image_class = new BP_Attachment_Cover_Image();
+
+ // Simulate an upload
+ $cover_image_class->upload( $_FILES );
+
+ // Should be empty
+ $this->assertEmpty( $this->original_upload_dir );
+
+ $this->assertTrue( 0 === $cover_image_class->upload_dir_filter_args );
+
+ $_FILES = $reset_files;
+ $_POST = $reset_post;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>