diff options
Diffstat (limited to 'modules/system/system.module')
| -rw-r--r-- | modules/system/system.module | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/system/system.module b/modules/system/system.module index bf1e7b93b..2ba242e22 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -615,7 +615,6 @@ function system_clean_url_settings() { if (!variable_get('clean_url', 0)) { if (strpos(request_uri(), '?q=') !== FALSE) { - drupal_add_js(array('cleanURL' => array('success' => t('Your server has been successfully tested to support this feature.'), 'failure' => t('Your system configuration does not currently support this feature. The <a href="http://drupal.org/node/15365">handbook page on Clean URLs</a> has additional troubleshooting information.'), 'testing' => t('Testing clean URLs...'))), 'setting'); drupal_add_js(drupal_get_path('module', 'system') .'/system.js', 'module'); drupal_add_js(' // Global Killswitch @@ -1060,6 +1059,7 @@ function system_theme_default() { 'slogan' ), 'stylesheet' => 'style.css', + 'script' => 'script.js', 'screenshot' => 'screenshot.png', ); } @@ -1113,6 +1113,10 @@ function system_theme_data() { if (!empty($themes[$key]->info['stylesheet'])) { $themes[$key]->info['stylesheet'] = dirname($themes[$key]->filename) .'/'. $themes[$key]->info['stylesheet']; } + // Give the script proper path information. + if (!empty($themes[$key]->info['script'])) { + $themes[$key]->info['script'] = dirname($themes[$key]->filename) .'/'. $themes[$key]->info['script']; + } // Give the screenshot proper path information. if (!empty($themes[$key]->info['screenshot'])) { $themes[$key]->info['screenshot'] = dirname($themes[$key]->filename) .'/'. $themes[$key]->info['screenshot']; |