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/system | |
| 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/system')
| -rw-r--r-- | modules/system/system.admin.inc | 6 | ||||
| -rw-r--r-- | modules/system/system.install | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index f4196123d..8daa45a3c 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1805,7 +1805,7 @@ function system_file_system_settings() { $form['file_public_path'] = array( '#type' => 'textfield', '#title' => t('Public file system path'), - '#default_value' => variable_get('file_public_path', file_directory_path()), + '#default_value' => variable_get('file_public_path', conf_path() . '/files'), '#maxlength' => 255, '#description' => t('A local file system path where public files will be stored. This directory must exist and be writable by Drupal. This directory must be relative to the Drupal installation directory and be accessible over the web.'), '#after_build' => array('system_check_directory'), @@ -1814,7 +1814,7 @@ function system_file_system_settings() { $form['file_private_path'] = array( '#type' => 'textfield', '#title' => t('Private file system path'), - '#default_value' => variable_get('file_private_path', file_directory_path('private')), + '#default_value' => variable_get('file_private_path', ''), '#maxlength' => 255, '#description' => t('A local file system path where private files will be stored. This directory must exist and be writable by Drupal. This directory should not be accessible over the web.'), '#after_build' => array('system_check_directory'), @@ -1823,7 +1823,7 @@ function system_file_system_settings() { $form['file_temporary_path'] = array( '#type' => 'textfield', '#title' => t('Temporary directory'), - '#default_value' => variable_get('file_temporary_path', file_directory_path('temporary')), + '#default_value' => variable_get('file_temporary_path', file_directory_temp()), '#maxlength' => 255, '#description' => t('A local file system path where temporary files will be stored. This directory should not be accessible over the web.'), '#after_build' => array('system_check_directory'), diff --git a/modules/system/system.install b/modules/system/system.install index 08be7bba9..4c8dcb9fa 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -323,7 +323,7 @@ function system_requirements($phase) { } } else { - if (variable_get('file_default_scheme', 'public') == 'public') { + if (file_default_scheme() == 'public') { $requirements['file system']['value'] = $t('Writable (<em>public</em> download method)'); } else { @@ -2726,7 +2726,7 @@ function system_update_7060(&$sandbox) { 'settings' => array( 'display_field' => 1, 'display_default' => variable_get('upload_list_default', 1), - 'uri_scheme' => variable_get('file_default_scheme', 'public'), + 'uri_scheme' => file_default_scheme(), 'default_file' => 0, ), ); @@ -2830,7 +2830,7 @@ function system_update_7060(&$sandbox) { } $basename = variable_get('file_directory_path', conf_path() . '/files'); - $scheme = variable_get('file_default_scheme', 'public') . '://'; + $scheme = file_default_scheme() . '://'; foreach ($node_revisions as $vid => $revision) { // We will convert filepaths to uri using the default scheme // and stripping off the existing file directory path. |