Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#931736 by dww: Fixed No upgrade path for the D6 'file_directory_temp' setting.

merge-requests/26/head
Angie Byron 2010-11-21 20:35:10 +00:00
parent 2e438914d2
commit fe7e01c60d
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/simpletest/tests/upgrade/drupal-6.filled.database.php
View File

@ -19735,7 +19735,15 @@ db_insert('variable')->fields(array(
))
->values(array(
'name' => 'file_directory_temp',
'value' => 's:26:"/Applications/MAMP/tmp/php";',
'value' => 's:29:"/drupal-6/file/directory/temp";',
))
->values(array(
'name' => 'file_directory_path',
'value' => 's:29:"/drupal-6/file/directory/path";',
))
->values(array(
'name' => 'file_downloads',
'value' => 'i:2;',
))
->values(array(
'name' => 'filter_html_1',

9
modules/simpletest/tests/upgrade/upgrade.upload.test
View File

@ -65,5 +65,14 @@ class UploadUpgradePathTestCase extends UpgradePathTestCase {
}
$this->assertIdentical($filenames, $recorded_filenames, 'The uploaded files are present in the same order after the upgrade.');
}
// Make sure the file settings were properly migrated.
$d6_file_directory_temp = '/drupal-6/file/directory/temp';
$d6_file_directory_path = '/drupal-6/file/directory/path';
$d6_file_downloads = 2; // FILE_DOWNLOADS_PRIVATE
$this->assertNull(variable_get('file_directory_temp', NULL), "The 'file_directory_temp' variable was properly removed.");
$this->assertEqual(variable_get('file_temporary_path', 'drupal-7-bogus'), $d6_file_directory_temp, "The 'file_temporary_path' setting was properly migrated.");
$this->assertEqual(variable_get('file_default_scheme', 'drupal-7-bogus'), 'private', "The 'file_default_scheme' setting was properly migrated.");
$this->assertEqual(variable_get('file_private_path', 'drupal-7-bogus'), $d6_file_directory_path, "The 'file_private_path' setting was properly migrated.");
}
}

11
modules/system/system.install
View File

@ -2157,7 +2157,7 @@ function system_update_7033() {
}
/**
* Migrate the file_downloads setting and create the new {file_managed} table.
* Migrate the file path settings and create the new {file_managed} table.
*/
function system_update_7034() {
$files_directory = variable_get('file_directory_path', NULL);
@ -2917,6 +2917,15 @@ function system_update_7065() {
db_delete('sessions')->condition('sid', '')->execute();
}
/**
* Migrate the 'file_directory_temp' variable.
*/
function system_update_7066() {
$d6_file_directory_temp = variable_get('file_directory_temp', file_directory_temp());
variable_set('file_temporary_path', $d6_file_directory_temp);
variable_del('file_directory_temp');
}
/**
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.