From 360e0d321e843ea2c7283bc28bdb6b196509791d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 7 Aug 2006 19:35:41 +0000
Subject: [PATCH] - Patch #77364 by webchick: 'administration page' is actually
'administration theme' -- so rename menu and callback.
---
modules/system/system.module | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/system/system.module b/modules/system/system.module
index 17b55d3759e5..5aaf97a634b6 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -128,11 +128,11 @@ function system_menu($may_cache) {
$items[] = array(
'path' => 'admin/settings/admin',
- 'title' => t('administration page'),
+ 'title' => t('administration theme'),
'description' => t('Settings for how your administrative pages should look.'),
'position' => 'left',
- 'callback' => 'system_admin_page_settings',
- 'block callback' => 'system_admin_page_settings',
+ 'callback' => 'system_admin_theme_settings',
+ 'block callback' => 'system_admin_theme_settings',
'access' => $access);
// Themes:
@@ -333,11 +333,11 @@ function system_admin_compact_page($mode = 'off') {
user_save($user, array('admin_compact_mode' => ($mode == 'on')));
drupal_goto('admin');
}
+
/**
- * This function provides a form to control the settings of the
- * administration page.
+ * This function allows selection of the theme to show in administration sections.
*/
-function system_admin_page_settings() {
+function system_admin_theme_settings() {
$themes = system_theme_data();
ksort($themes);
$options[0] = t('System default');
@@ -356,14 +356,14 @@ function system_admin_page_settings() {
// In order to give it our own submit, we have to give it the default submit
// too because the presence of a #submit will prevent the default #submit
// from being used. Also we want ours first.
- $form['#submit']['system_admin_page_submit'] = array();
+ $form['#submit']['system_admin_theme_submit'] = array();
$form['#submit']['system_settings_form_submit'] = array();
- return system_settings_form('system_admin_page_form', $form);
+ return system_settings_form('system_admin_theme_form', $form);
}
-function system_admin_page_submit($form_id, $form_values) {
+function system_admin_theme_submit($form_id, $form_values) {
// If we're changing themes, make sure the theme has its blocks initialized.
if ($form_values['admin_theme'] != variable_get('admin_theme', 'bluemarine')) {
$result = db_query("SELECT status FROM {blocks} WHERE theme = '%s'", $form_values['admin_theme']);
--
GitLab