From fb300d1f967d17a10678582f46e82bd133d23aae Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 1 Sep 2010 20:08:17 +0000 Subject: - Patch #895308 by Damien Tournoud: remove file_directory_path(). --- modules/file/file.field.inc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'modules/file/file.field.inc') 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); } /** -- cgit v1.2.3