diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-05-14 04:50:18 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-05-14 04:50:18 +0000 |
| commit | 3d77abdd37a01342ce81548c5506abf75cb39e1a (patch) | |
| tree | a3e3caaeafab36ce8b92832e4bbf811f2adf8afe | |
| parent | 9b54c79c868cd310ca8c6ea77fbb337c543f9682 (diff) | |
| download | brdo-3d77abdd37a01342ce81548c5506abf75cb39e1a.tar.gz brdo-3d77abdd37a01342ce81548c5506abf75cb39e1a.tar.bz2 | |
#790224 by lotyrin, pwolanin, nenne: Fixed incorrect paths to temp directory in Update Manager.
| -rw-r--r-- | includes/authorize.inc | 2 | ||||
| -rw-r--r-- | modules/update/update.manager.inc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/authorize.inc b/includes/authorize.inc index 8ae771a5d..02e6cabc3 100644 --- a/includes/authorize.inc +++ b/includes/authorize.inc @@ -83,7 +83,7 @@ function authorize_filetransfer_form($form_state) { $form['connection_settings']['authorize_filetransfer_default']['#options'][$name] = $backend['title']; $form['connection_settings'][$name] = array( '#type' => 'fieldset', - '#attributes' => array('class' => "filetransfer-$name filetransfer"), + '#attributes' => array('class' => array("filetransfer-$name", 'filetransfer')), '#title' => t('@backend connection settings', array('@backend' => $backend['title'])), ); diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc index 48f88d07e..39540cbd6 100644 --- a/modules/update/update.manager.inc +++ b/modules/update/update.manager.inc @@ -635,7 +635,7 @@ function update_manager_install_form_submit($form, &$form_state) { function _update_manager_extract_directory() { $directory = &drupal_static(__FUNCTION__, ''); if (empty($directory)) { - $directory = DRUPAL_ROOT . '/' . file_directory_path('temporary') . '/update-extraction'; + $directory = 'temporary://update-extraction'; if (!file_exists($directory)) { mkdir($directory); } @@ -708,8 +708,8 @@ function update_manager_file_get($url) { } // Check the cache and download the file if needed. - $local = 'temporary://update-cache/' . basename($parsed_url['path']); - $cache_directory = DRUPAL_ROOT . '/' . file_directory_path('temporary') . '/update-cache/'; + $cache_directory = 'temporary://update-cache'; + $local = $cache_directory . '/' . basename($parsed_url['path']); if (!file_exists($cache_directory)) { mkdir($cache_directory); |