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.
The solution is to replace the string %directory with %destination, as that is the variable replacement used throughout the file_unmanaged_copy function.
| Comment | File | Size | Author |
|---|---|---|---|
| #8 | drupal--1815930--update-watchdog-message-8-D7.patch | 951 bytes | slashrsm |
| #5 | drupal--1815930--update-watchdog-message-5-D7.patch | 955 bytes | slashrsm |
| #2 | drupal--1815930--update-watchdog-message-2.patch | 1.32 KB | amontero |
| #1 | drupal-update-watchdog-message-1815930-0.patch | 955 bytes | gbrands |
Comments
Comment #1
gbrands commentedHere is a patch that hopefully fixes this issue.
Comment #2
amonteroPatch 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.
Comment #3
slashrsm commentedLooks OK. It is a simple patch so I'd say it is RTBC.
Comment #4
catchLooks fine, don't think we need an explicit test for this. Committed/pushed to 8.x, looks like this needs backport to 7.x.
Comment #5
slashrsm commentedHere it is...
Comment #6
amonteroThanks! Both #1 and #5 patches fix it for 7.x (they are bitwise identical).
Comment #7
David_Rothstein commentedFor 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.
Comment #8
slashrsm commentedHere it goes....
Comment #9
David_Rothstein commentedLooks good to me as long as tests pass.
Comment #10
David_Rothstein commentedCommitted to 7.x - thanks! http://drupalcode.org/project/drupal.git/commit/286deb8