Skip to content

Commit da67bd5

Browse files
committed
Make filter callbacks private
1 parent 66a4966 commit da67bd5

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

src/Media_Command.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@ public function import( $args, $assoc_args = array() ) {
312312
$assoc_args['post_id'] = false;
313313
}
314314

315+
$destdir = Utils\get_flag_value( $assoc_args, 'destination-dir' );
316+
317+
$filter_upload_dir = function ( $uploads ) {
318+
return $this->filter_upload_dir( $uploads );
319+
};
320+
315321
$number = 0;
316322
$successes = 0;
317323
$errors = 0;
@@ -424,10 +430,9 @@ public function import( $args, $assoc_args = array() ) {
424430
wp_update_attachment_metadata( $success, wp_generate_attachment_metadata( $success, $file ) );
425431
} else {
426432

427-
$destdir = Utils\get_flag_value( $assoc_args, 'destination-dir' );
428433
if ( ! empty( $destdir ) ) {
429434
$this->destination_dir = $destdir;
430-
add_filter( 'upload_dir', [ $this, 'filter_upload_dir' ], PHP_INT_MAX );
435+
add_filter( 'upload_dir', $filter_upload_dir, PHP_INT_MAX );
431436
}
432437

433438
// Deletes the temporary file.
@@ -487,7 +492,7 @@ public function import( $args, $assoc_args = array() ) {
487492
++$successes;
488493
}
489494

490-
remove_filter( 'upload_dir', [ $this, 'filter_upload_dir' ], PHP_INT_MAX );
495+
remove_filter( 'upload_dir', $filter_upload_dir, PHP_INT_MAX );
491496

492497
// Report the result of the operation
493498
if ( ! Utils\get_flag_value( $assoc_args, 'porcelain' ) ) {
@@ -999,7 +1004,7 @@ private function add_site_icon_filter( $id ) {
9991004
return $filter;
10001005
}
10011006

1002-
public function filter_upload_dir( $uploads ) {
1007+
private function filter_upload_dir( $uploads ) {
10031008
if ( ! $this->destination_dir ) {
10041009
return $uploads;
10051010
}

0 commit comments

Comments
 (0)