diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-05-27 11:43:43 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-05-27 11:43:43 +0000 |
commit | 66108c34acf55a5cd38dca6c6e6aeb63dd61c678 (patch) | |
tree | ba32f07957693428988b2bb0aafe6d2a67f5dc04 /modules/system/system.module | |
parent | 827e278489e55a294150524feb118bedfa6f2e92 (diff) | |
download | brdo-66108c34acf55a5cd38dca6c6e6aeb63dd61c678.tar.gz brdo-66108c34acf55a5cd38dca6c6e6aeb63dd61c678.tar.bz2 |
- Patch #351487 by JohnAlbin, deviantintegral et al: remove default values for stylesheets and scripts.
Diffstat (limited to 'modules/system/system.module')
-rw-r--r-- | modules/system/system.module | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index c363e5aa7..876704b55 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -1173,10 +1173,6 @@ function system_theme_default() { 'main_menu', 'secondary_menu', ), - 'stylesheets' => array( - 'all' => array('style.css') - ), - 'scripts' => array('script.js'), 'screenshot' => 'screenshot.png', 'php' => DRUPAL_MINIMUM_PHP, ); @@ -1267,17 +1263,21 @@ function _system_theme_data() { // Give the stylesheets proper path information. $pathed_stylesheets = array(); - foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { - foreach ($stylesheets as $stylesheet) { - $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->filepath) . '/' . $stylesheet; + if (isset($themes[$key]->info['stylesheets'])) { + foreach ($themes[$key]->info['stylesheets'] as $media => $stylesheets) { + foreach ($stylesheets as $stylesheet) { + $pathed_stylesheets[$media][$stylesheet] = dirname($themes[$key]->filepath) . '/' . $stylesheet; + } } } $themes[$key]->info['stylesheets'] = $pathed_stylesheets; // Give the scripts proper path information. $scripts = array(); - foreach ($themes[$key]->info['scripts'] as $script) { - $scripts[$script] = dirname($themes[$key]->filepath) . '/' . $script; + if (isset($themes[$key]->info['scripts'])) { + foreach ($themes[$key]->info['scripts'] as $script) { + $scripts[$script] = dirname($themes[$key]->filepath) . '/' . $script; + } } $themes[$key]->info['scripts'] = $scripts; // Give the screenshot proper path information. |