From 8691c9f2e8c6076dc689dc4fc691b97f4a01f699 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 5 Jan 2010 18:00:14 +0000 Subject: [PATCH] #420358 follow-up by Dave Reid: Fix some straggler default => standard renaming. --- modules/simpletest/tests/bootstrap.test | 2 +- modules/simpletest/tests/module.test | 6 +++--- modules/system/system.install | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/simpletest/tests/bootstrap.test b/modules/simpletest/tests/bootstrap.test index ff71a167a48..a02d34c7a6d 100644 --- a/modules/simpletest/tests/bootstrap.test +++ b/modules/simpletest/tests/bootstrap.test @@ -339,7 +339,7 @@ class BootstrapGetFilenameTestCase extends DrupalUnitTestCase { $this->assertIdentical(drupal_get_filename('theme_engine', 'phptemplate'), 'themes/engines/phptemplate/phptemplate.engine', t('Retrieve theme engine location.')); // Retrieving a file that is definitely not stored in the database. - $this->assertIdentical(drupal_get_filename('profile', 'default'), 'profiles/default/default.profile', t('Retrieve install profile location.')); + $this->assertIdentical(drupal_get_filename('profile', 'standard'), 'profiles/standard/standard.profile', t('Retrieve install profile location.')); } } diff --git a/modules/simpletest/tests/module.test b/modules/simpletest/tests/module.test index 049f6f75fb3..939804953fd 100644 --- a/modules/simpletest/tests/module.test +++ b/modules/simpletest/tests/module.test @@ -23,18 +23,18 @@ class ModuleUnitTest extends DrupalWebTestCase { */ function testModuleList() { // Build a list of modules, sorted alphabetically. - $profile_info = install_profile_info('default', 'en'); + $profile_info = install_profile_info('standard', 'en'); $module_list = $profile_info['dependencies']; // Install profile is a module that is expected to be loaded. - $module_list[] = 'default'; + $module_list[] = 'standard'; sort($module_list); // Compare this list to the one returned by module_list(). We expect them // to match, since all default profile modules have a weight equal to 0 // (except for block.module, which has a lower weight but comes first in // the alphabet anyway). - $this->assertModuleList($module_list, t('Default profile')); + $this->assertModuleList($module_list, t('Standard profile')); // Try to install a new module. drupal_install_modules(array('contact')); diff --git a/modules/system/system.install b/modules/system/system.install index 4a1e9ccddc8..add4c37c4ea 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -32,7 +32,7 @@ function system_requirements($phase) { // Display the currently active install profile, if the site // is not running the default install profile. $profile = drupal_get_profile(); - if ($profile != 'default') { + if ($profile != 'standard') { $info = install_profile_info($profile); $requirements['install_profile'] = array( 'title' => $t('Install profile'),