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/user/user.admin.inc | |
| 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/user/user.admin.inc')
| -rw-r--r-- | modules/user/user.admin.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 1e017cdf8..58f881010 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -341,7 +341,7 @@ function user_admin_settings() { ); // If picture support is enabled, check whether the picture directory exists. if (variable_get('user_pictures', 0)) { - $picture_path = variable_get('file_default_scheme', 'public') . '://' . variable_get('user_picture_path', 'pictures'); + $picture_path = file_default_scheme() . '://' . variable_get('user_picture_path', 'pictures'); if (!file_prepare_directory($picture_path, FILE_CREATE_DIRECTORY)) { form_set_error('user_picture_path', t('The directory %directory does not exist or is not writable.', array('%directory' => $picture_path))); watchdog('file system', 'The directory %directory does not exist or is not writable.', array('%directory' => $picture_path), WATCHDOG_ERROR); @@ -369,7 +369,7 @@ function user_admin_settings() { '#default_value' => variable_get('user_picture_path', 'pictures'), '#size' => 30, '#maxlength' => 255, - '#description' => t('Subdirectory in the directory %dir where pictures will be stored.', array('%dir' => file_directory_path() . '/')), + '#description' => t('Subdirectory in the file upload directory where pictures will be stored.'), ); $form['personalization']['pictures']['user_picture_default'] = array( '#type' => 'textfield', |