Cleanup file_field_widget_uri() and its token replacement [#984456]

Currently the file_field_widget_uri() function calls token_replace() on the upload directory path, but it improperly duplicates the 'current-user' token by injecting it with $data['user']. And the function also has a mystery $account parameter that is not used at all in core, and so I changed it to $data as an empty array which is passed into token_replace().

Comment	File	Size	Author
#8	984456-7.patch	2.11 KB	bfroehle
#4	984456-file-field-widget-uri-token-cleanup.patch	2.89 KB	dave reid
#2	984456-file-field-widget-uri-token-cleanup.patch	1.38 KB	dave reid
#1	984456-file-field-widget-uri-token-cleanup-D7.patch	1.38 KB	dave reid

Comments

Comment #1

dave reid

he/him

English

Nebraska USA

commented 29 November 2010 at 18:58

Status:	Active	» Needs review
Issue tags:		+token

Status	File	Size
new	984456-file-field-widget-uri-token-cleanup-D7.patch	1.38 KB

Comment #2

dave reid

he/him

English

Nebraska USA

commented 29 November 2010 at 18:59

Status	File	Size
new	984456-file-field-widget-uri-token-cleanup.patch	1.38 KB

Grr, are patches with '-D7' still being ignored??

Comment #3

29 November 2010 at 20:01

Status:

Needs review

» Needs work

The last submitted patch, 984456-file-field-widget-uri-token-cleanup.patch, failed testing.

Comment #4

dave reid

he/him

English

Nebraska USA

commented 7 December 2010 at 16:20

Status:

Needs work

» Needs review

Status	File	Size
new	984456-file-field-widget-uri-token-cleanup.patch	2.89 KB

Comment #5

7 December 2010 at 17:01

Status:

Needs review

» Needs work

The last submitted patch, 984456-file-field-widget-uri-token-cleanup.patch, failed testing.

Comment #6

moshe weitzman commented 24 February 2011 at 14:50

Seems like a useful patch. Can we fix the test failure? Migrate is starting to use this function.

Comment #7

bfroehle commented 24 February 2011 at 18:26

+++ modules/file/tests/file.test	7 Dec 2010 16:19:21 -0000
@@ -938,8 +938,7 @@ class FileFieldPathTestCase extends File
-    $data = array('user' => $this->admin_user);
-    $subdirectory = token_replace('[user:uid]/[user:name]', $data);
+    $subdirectory = token_replace('[current-user:uid]/[current-user:name]');

This breaks the test, as we compare the token for the file (uploaded by uid = 2), with the token replacement for the current-user (uid = 1).

Powered by Dreditor.