summaryrefslogtreecommitdiff
path: root/modules/system.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system.module')
-rw-r--r--modules/system.module17
1 files changed, 5 insertions, 12 deletions
diff --git a/modules/system.module b/modules/system.module
index a5d4133a4..59f542491 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -70,7 +70,7 @@ function system_menu($may_cache) {
$items[] = array('path' => 'admin', 'title' => t('administer'),
'access' => user_access('access administration pages'),
- 'callback' => 'system_admin_page',
+ 'callback' => 'watchdog_overview',
'weight' => 9);
// Themes:
@@ -120,13 +120,6 @@ function system_test() {
}
/**
- * Menu callback; provides the main page of the administration section.
- */
-function system_admin_page() {
- watchdog_overview('actions');
-}
-
-/**
* Implementation of hook_user().
*
* Allows users to individually set their theme and time zone.
@@ -574,7 +567,7 @@ function system_themes() {
system_listing_save();
$form = system_theme_listing();
$form .= form_submit(t('Save configuration'));
- print theme('page', form($form));
+ return form($form);
}
/**
@@ -584,7 +577,7 @@ function system_modules() {
system_listing_save();
$form = system_module_listing();
$form .= form_submit(t('Save configuration'));
- print theme('page', form($form));
+ return form($form);
}
/**
@@ -600,7 +593,7 @@ function system_site_settings($module = NULL) {
$form = system_view_general();
}
- print theme('page', system_settings_form($form));
+ return system_settings_form($form);
}
/**
@@ -711,7 +704,7 @@ function system_theme_settings($key = '') {
$form .= form_submit(t('Save configuration'));
$form .= form_submit(t('Reset to defaults'));
- print theme('page', form($form, 'post', null, array('enctype' => 'multipart/form-data')));
+ return form($form, 'post', null, array('enctype' => 'multipart/form-data'));
}