diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-09-01 20:08:17 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-09-01 20:08:17 +0000 |
| commit | fb300d1f967d17a10678582f46e82bd133d23aae (patch) | |
| tree | 8a5aa158ce6669cce5116e2f1a7f3ece363886cc /modules/file | |
| parent | d62224dc56c59546a68ff2ecc1686f3cf59674a1 (diff) | |
| download | brdo-fb300d1f967d17a10678582f46e82bd133d23aae.tar.gz brdo-fb300d1f967d17a10678582f46e82bd133d23aae.tar.bz2 | |
- Patch #895308 by Damien Tournoud: remove file_directory_path().
Diffstat (limited to 'modules/file')
| -rw-r--r-- | modules/file/file.field.inc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index 403f94f66..38a24bde3 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -193,15 +193,7 @@ function _file_generic_settings_extensions($element, &$form_state) { function _file_generic_settings_file_directory_validate($element, &$form_state) { // Strip slashes from the beginning and end of $widget['file_directory']. $value = trim($element['#value'], '\\/'); - - // Do not allow the file path to be the same as the file_directory_path(). - // This causes all sorts of problems with things like file_create_url(). - if (strpos($value, file_directory_path()) === 0) { - form_error($element, t('The file directory (@file_directory) cannot start with the system files directory (@files_directory), as this may cause conflicts when building file URLs.', array('@file_directory' => $form_state['values']['file_directory'], '@files_directory' => file_directory_path()))); - } - else { - form_set_value($element, $value, $form_state); - } + form_set_value($element, $value, $form_state); } /** |