diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-10-19 23:28:40 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-10-19 23:28:40 +0000 |
| commit | 33452c61a29565c495f57793de2f4967ad118b12 (patch) | |
| tree | 6df52ac1a476f156e7a9b10dd9d09302dd5124b0 | |
| parent | 70abacbb7bf514d0170702870dacde756971d0e7 (diff) | |
| download | brdo-33452c61a29565c495f57793de2f4967ad118b12.tar.gz brdo-33452c61a29565c495f57793de2f4967ad118b12.tar.bz2 | |
- Patch #550742 by sun: removed some left-over code.
| -rw-r--r-- | includes/theme.inc | 1 | ||||
| -rw-r--r-- | modules/search/search.test | 5 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 4b55c5aee..7238a1fab 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -1146,7 +1146,6 @@ function theme_get_setting($setting_name, $theme = NULL) { 'toggle_logo' => 1, 'toggle_favicon' => 1, 'toggle_name' => 1, - 'toggle_search' => 1, 'toggle_slogan' => 1, 'toggle_node_user_picture' => 1, 'toggle_comment_user_picture' => 1, diff --git a/modules/search/search.test b/modules/search/search.test index 7ce30865b..9145d3385 100644 --- a/modules/search/search.test +++ b/modules/search/search.test @@ -395,11 +395,6 @@ class SearchBlockTestCase extends DrupalWebTestCase { // Create and login user $admin_user = $this->drupalCreateUser(array('administer blocks', 'search content')); $this->drupalLogin($admin_user); - - // Disable the theme form to avoid confusion. - $settings = theme_get_settings(); - $settings['toggle_search'] = FALSE; - variable_set('theme_settings', $settings); } function testSearchFormBlock() { diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 214a46ba5..aa1d2e9d1 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -453,9 +453,6 @@ function system_theme_settings($form, &$form_state, $key = '') { $disabled['toggle_node_user_picture'] = TRUE; $disabled['toggle_comment_user_picture'] = TRUE; } - if (!module_exists('search')) { - $disabled['toggle_search'] = TRUE; - } $form['theme_settings'] = array( '#type' => 'fieldset', |