diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-14 02:38:33 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-14 02:38:33 +0000 |
| commit | 583e63c136d388f8f54222960a0f2c46e4dbc8e9 (patch) | |
| tree | f54f337c1e011ca107a943ca23d5648064843e12 | |
| parent | 39e40b5bbda87d910bb38c74e1144683d716a28a (diff) | |
| download | brdo-583e63c136d388f8f54222960a0f2c46e4dbc8e9.tar.gz brdo-583e63c136d388f8f54222960a0f2c46e4dbc8e9.tar.bz2 | |
Theme system bug: only show search box if search.module is enabled.
| -rw-r--r-- | includes/theme.inc | 5 | ||||
| -rw-r--r-- | modules/system.module | 5 | ||||
| -rw-r--r-- | modules/system/system.module | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index c59a7f11f..f22a775c0 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -233,6 +233,11 @@ function theme_get_settings($key = NULL) { $settings = array_merge($settings, variable_get(str_replace('/', '_', 'theme_'. $key .'_settings'), array())); } + // Only offer search box if search.module is enabled. + if (!module_exist('search')) { + $settings['toggle_search'] = 0; + } + return $settings; } diff --git a/modules/system.module b/modules/system.module index b955cdd89..dc0b6bba0 100644 --- a/modules/system.module +++ b/modules/system.module @@ -659,13 +659,16 @@ function system_theme_settings() { // Toggle settings $toggles = array('toggle_name' => t('Site name'), - 'toggle_search' => t('Search box'), 'toggle_slogan' => t('Site slogan'), 'toggle_mission' => t('Mission statement'), 'toggle_primary_links' => t('Primary links'), 'toggle_secondary_links' => t('Secondary links'), 'toggle_node_user_picture' => t('User pictures in posts'), 'toggle_comment_user_picture' => t('User pictures in comments')); + // Only offer search box if search;module is enabled. + if (module_exist('search')) { + $toggles['toggle_search'] = t('Search box'); + } foreach ($toggles as $name => $title) { if ((!$key) || in_array($name, $features)) { diff --git a/modules/system/system.module b/modules/system/system.module index b955cdd89..dc0b6bba0 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -659,13 +659,16 @@ function system_theme_settings() { // Toggle settings $toggles = array('toggle_name' => t('Site name'), - 'toggle_search' => t('Search box'), 'toggle_slogan' => t('Site slogan'), 'toggle_mission' => t('Mission statement'), 'toggle_primary_links' => t('Primary links'), 'toggle_secondary_links' => t('Secondary links'), 'toggle_node_user_picture' => t('User pictures in posts'), 'toggle_comment_user_picture' => t('User pictures in comments')); + // Only offer search box if search;module is enabled. + if (module_exist('search')) { + $toggles['toggle_search'] = t('Search box'); + } foreach ($toggles as $name => $title) { if ((!$key) || in_array($name, $features)) { |