Mwalker has submitted this change and it was merged. Change subject: Actually move to the "completed" dir ......................................................................
Actually move to the "completed" dir Previously we had been ignoring the new directory and moved files to a subdir within dirname($current_path). Change-Id: Iceba7058cc0628a67ccc468ff3f379d517b19b2a --- M sites/all/modules/globalcollect_audit/globalcollect_audit.module 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Mwalker: Looks good to me, approved jenkins-bot: Verified diff --git a/sites/all/modules/globalcollect_audit/globalcollect_audit.module b/sites/all/modules/globalcollect_audit/globalcollect_audit.module index a3eca12..82cf7fc 100644 --- a/sites/all/modules/globalcollect_audit/globalcollect_audit.module +++ b/sites/all/modules/globalcollect_audit/globalcollect_audit.module @@ -1011,8 +1011,8 @@ } } - $path_info = pathinfo( $file ); - $newfile = $path_info['dirname'] . '/' . $subdir . '/' . $path_info['basename']; + $filename = basename( $file ); + $newfile = $completed_dir . '/' . $filename; if (!rename( $file, $newfile )){ $message = "Unable to move $file to $newfile"; -- To view, visit https://gerrit.wikimedia.org/r/133850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iceba7058cc0628a67ccc468ff3f379d517b19b2a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Adamw <awi...@wikimedia.org> Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org> Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org> Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits