diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-20 17:21:37 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-08-20 17:21:37 +0000 |
| commit | 9f2d6f0e5193ebf8e65289f37b3a8d182bbd7e08 (patch) | |
| tree | b8870391f817f337903c6835a33cabbaa1c6aa0c /modules/system.module | |
| parent | 1a82f4d4dbf7f137d5940ca989a1a332cf4b21ce (diff) | |
| download | brdo-9f2d6f0e5193ebf8e65289f37b3a8d182bbd7e08.tar.gz brdo-9f2d6f0e5193ebf8e65289f37b3a8d182bbd7e08.tar.bz2 | |
- Fixing 'flash of unstyled content' in bluemarine/pushbutton, which got reintroduced after the template changes.
- Fixed separate styles: added theme_get_styles() and the xtemplate {styles} tag to make sure stylesheets get included in the right order (drupal-specific, template-specific, style-specific).
- Fixing missing class on screenshots.
- Renamed drupal_get_theme_setting() and drupal_get_theme_settings() to theme_get_setting() and theme_get_settings().
Diffstat (limited to 'modules/system.module')
| -rw-r--r-- | modules/system.module | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/system.module b/modules/system.module index e7f049be9..52b922e08 100644 --- a/modules/system.module +++ b/modules/system.module @@ -115,7 +115,7 @@ function system_user($type, $edit, &$user, $category = NULL) { // Screenshot column. $screenshot = dirname($value->filename) .'/screenshot.png'; - $row[] = file_exists($screenshot) ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $value->name)), '', 'class="screenshot"') : t('no screenshot'); + $row[] = file_exists($screenshot) ? theme('image', $screenshot, t('Screenshot for %theme theme', array('%theme' => $value->name)), '', 'class="screenshot"', false) : t('no screenshot'); // Information field. $field = '<strong>'. basename($value->name) .'</strong>'; @@ -391,7 +391,7 @@ function system_theme_listing() { $row = array(); // Screenshot column. - $row[] = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->shortname)), '', 'class="screenshot"') : t('no screenshot'); + $row[] = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->shortname)), '', 'class="screenshot"', false) : t('no screenshot'); // Information field. $field = '<strong>'. $info->shortname .'</strong>'; @@ -568,13 +568,13 @@ function system_theme_settings() { // Default settings are defined in _theme_settings() in includes/theme.inc $key = str_replace('.', '/', arg(3)); if ($key) { - $settings = drupal_get_theme_settings($key); + $settings = theme_get_settings($key); $var = str_replace('/', '_', 'theme_'. $key .'_settings'); $themes = system_theme_data('themes'); $features = function_exists($themes[$key]->prefix .'_features') ? call_user_func($themes[$key]->prefix .'_features') : array(); } else { - $settings = drupal_get_theme_settings(''); + $settings = theme_get_settings(''); $var = 'theme_settings'; } |