Commit 66108c34 authored by Dries's avatar Dries

- Patch #351487 by JohnAlbin, deviantintegral et al: remove default values for...

- Patch #351487 by JohnAlbin, deviantintegral et al: remove default values for stylesheets and scripts.
parent 827e2784
......@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment