Problem/Motivation

The %directory replacement variable does not exist in the watchdog message on line 895 of includes/file.inc. It currently leaves the user with an unhelpful directory/destination of %destination.

Proposed resolution

The solution is to replace the string %directory with %destination, as that is the variable replacement used throughout the file_unmanaged_copy function.

Files: 
CommentFileSizeAuthor
#8 drupal--1815930--update-watchdog-message-8-D7.patch951 bytesslashrsm
PASSED: [[SimpleTest]]: [MySQL] 39,705 pass(es).
[ View ]
#5 drupal--1815930--update-watchdog-message-5-D7.patch955 bytesslashrsm
PASSED: [[SimpleTest]]: [MySQL] 39,660 pass(es).
[ View ]
#2 drupal--1815930--update-watchdog-message-2.patch1.32 KBamontero
PASSED: [[SimpleTest]]: [MySQL] 48,826 pass(es).
[ View ]
#1 drupal-update-watchdog-message-1815930-0.patch955 bytesgbrands
PASSED: [[SimpleTest]]: [MySQL] 39,531 pass(es).
[ View ]

Comments

gbrands’s picture

Status:Active» Needs review
StatusFileSize
new955 bytes
PASSED: [[SimpleTest]]: [MySQL] 39,531 pass(es).
[ View ]

Here is a patch that hopefully fixes this issue.

amontero’s picture

Version:7.x-dev» 8.x-dev
StatusFileSize
new1.32 KB
PASSED: [[SimpleTest]]: [MySQL] 48,826 pass(es).
[ View ]

Patch to 7.x applies OK and looks good to me.
However, since the bug is also present in 8.x, this issue should address current dev version before being backported. Patch against 8.x HEAD attached.

slashrsm’s picture

Status:Needs review» Reviewed & tested by the community

Looks OK. It is a simple patch so I'd say it is RTBC.

catch’s picture

Version:8.x-dev» 7.x-dev
Status:Reviewed & tested by the community» Patch (to be ported)
Issue tags:+needs backport to D7

Looks fine, don't think we need an explicit test for this. Committed/pushed to 8.x, looks like this needs backport to 7.x.

slashrsm’s picture

Status:Patch (to be ported)» Needs review
StatusFileSize
new955 bytes
PASSED: [[SimpleTest]]: [MySQL] 39,660 pass(es).
[ View ]

Here it is...

amontero’s picture

Status:Needs review» Reviewed & tested by the community

Thanks! Both #1 and #5 patches fix it for 7.x (they are bitwise identical).

David_Rothstein’s picture

Status:Reviewed & tested by the community» Needs work

For Drupal 7, we should fix this the opposite way (so we don't break translations).

In other words, leave "%directory" as the variable in the translatable string, but change the array to use %directory rather than %destination.

slashrsm’s picture

Status:Needs work» Needs review
StatusFileSize
new951 bytes
PASSED: [[SimpleTest]]: [MySQL] 39,705 pass(es).
[ View ]

Here it goes....

David_Rothstein’s picture

Status:Needs review» Reviewed & tested by the community

Looks good to me as long as tests pass.

David_Rothstein’s picture

Status:Reviewed & tested by the community» Fixed

Automatically closed -- issue fixed for 2 weeks with no activity.