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

#420358 follow-up by Dave Reid: Fix some straggler default => standard renaming.

merge-requests/26/head
Angie Byron 2010-01-05 18:00:14 +00:00
parent f1da003bfe
commit 8691c9f2e8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/simpletest/tests/bootstrap.test
View File

@ -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.'));
}
}

6
modules/simpletest/tests/module.test
View File

@ -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'));

2
modules/system/system.install
View File

@ -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'),