Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.971 diff -u -p -r1.971 common.inc --- includes/common.inc 24 Aug 2009 00:14:18 -0000 1.971 +++ includes/common.inc 24 Aug 2009 01:35:45 -0000 @@ -3591,7 +3591,10 @@ function _drupal_bootstrap_full() { ini_set('log_errors', 1); ini_set('error_log', file_directory_path() . '/error.log'); } - + // Set a custom theme for the current page, if there is one. We need to run + // this before invoking hook_init(), since any modules which initialize the + // theme system will prevent a custom theme from being correctly set later. + menu_set_custom_theme(); // Let all modules take action before menu system handles the request // We do not want this while running update.php. if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update') { Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.340 diff -u -p -r1.340 menu.inc --- includes/menu.inc 24 Aug 2009 00:14:18 -0000 1.340 +++ includes/menu.inc 24 Aug 2009 01:35:45 -0000 @@ -359,8 +359,9 @@ function menu_set_item($path, $router_it * The router item, an associate array corresponding to one row in the * menu_router table. The value of key map holds the loaded objects. The * value of key access is TRUE if the current user can access this page. - * The values for key title, page_arguments, access_arguments will be - * filled in based on the database values and the objects loaded. + * The values for key title, page_arguments, access_arguments, and + * theme_arguments will be filled in based on the database values and the + * objects loaded. */ function menu_get_item($path = NULL, $router_item = NULL) { $router_items = &drupal_static(__FUNCTION__); @@ -390,6 +391,7 @@ function menu_get_item($path = NULL, $ro if ($router_item['access']) { $router_item['map'] = $map; $router_item['page_arguments'] = array_merge(menu_unserialize($router_item['page_arguments'], $map), array_slice($map, $router_item['number_parts'])); + $router_item['theme_arguments'] = array_merge(menu_unserialize($router_item['theme_arguments'], $map), array_slice($map, $router_item['number_parts'])); } } $router_items[$path] = $router_item; @@ -892,6 +894,8 @@ function menu_tree_all_data($menu_name, 'title', 'title_callback', 'title_arguments', + 'theme_callback', + 'theme_arguments', 'type', 'description', )); @@ -1062,6 +1066,8 @@ function menu_tree_page_data($menu_name) 'title', 'title_callback', 'title_arguments', + 'theme_callback', + 'theme_arguments', 'type', 'description', )); @@ -1366,6 +1372,38 @@ function menu_get_active_help() { } /** + * Gets the custom theme for the current page, if there is one. + * + * @param $initialize + * This parameter should only be used internally; it is set to TRUE in order + * to force the custom theme to be initialized from the menu router item for + * the current page. + * @return + * The machine-readable name of the custom theme, if there is one. + * + * @see menu_set_custom_theme() + */ +function menu_get_custom_theme($initialize = FALSE) { + $custom_theme = &drupal_static(__FUNCTION__); + // Skip this if the site is offline or being installed or updated, since the + // menu system may not be correctly initialized then. + if ($initialize && !_menu_site_is_offline(TRUE) && (!defined('MAINTENANCE_MODE') || (MAINTENANCE_MODE != 'update' && MAINTENANCE_MODE != 'install'))) { + $router_item = menu_get_item(); + if (!empty($router_item['access']) && !empty($router_item['theme_callback']) && function_exists($router_item['theme_callback'])) { + $custom_theme = call_user_func_array($router_item['theme_callback'], $router_item['theme_arguments']); + } + } + return $custom_theme; +} + +/** + * Sets a custom theme for the current page, if there is one. + */ +function menu_set_custom_theme() { + menu_get_custom_theme(TRUE); +} + +/** * Build a list of named menus. */ function menu_get_names() { @@ -2705,6 +2743,13 @@ function _menu_router_build($callbacks) $item['file path'] = $parent['file path']; } } + // Same for theme callbacks. + if (!isset($item['theme callback']) && isset($parent['theme callback'])) { + $item['theme callback'] = $parent['theme callback']; + if (!isset($item['theme arguments']) && isset($parent['theme arguments'])) { + $item['theme arguments'] = $parent['theme arguments']; + } + } } } if (!isset($item['access callback']) && isset($item['access arguments'])) { @@ -2726,6 +2771,8 @@ function _menu_router_build($callbacks) 'block callback' => '', 'title arguments' => array(), 'title callback' => 't', + 'theme arguments' => array(), + 'theme callback' => '', 'description' => '', 'position' => '', 'tab_parent' => '', @@ -2775,6 +2822,8 @@ function _menu_router_save($menu, $masks 'title', 'title_callback', 'title_arguments', + 'theme_callback', + 'theme_arguments', 'type', 'block_callback', 'description', @@ -2800,6 +2849,8 @@ function _menu_router_save($menu, $masks 'title' => $item['title'], 'title_callback' => $item['title callback'], 'title_arguments' => ($item['title arguments'] ? serialize($item['title arguments']) : ''), + 'theme_callback' => $item['theme callback'], + 'theme_arguments' => serialize($item['theme arguments']), 'type' => $item['type'], 'block_callback' => $item['block callback'], 'description' => $item['description'], @@ -2830,20 +2881,24 @@ function menu_path_is_external($path) { * This function will log the current user out and redirect to front page * if the current user has no 'access site in maintenance mode' permission. * + * @param $check_only + * If this is set to TRUE, the function will perform the access checks and + * return the site offline status, but not log the user out or display any + * messages. * @return * FALSE if the site is not in maintenance mode, the user login page is * displayed, or the user has the 'access site in maintenance mode' * permission. TRUE for anonymous users not being on the login page when the * site is in maintenance mode. */ -function _menu_site_is_offline() { +function _menu_site_is_offline($check_only = FALSE) { // Check if site is in maintenance mode. if (variable_get('maintenance_mode', 0)) { if (user_access('access site in maintenance mode')) { // Ensure that the maintenance mode message is displayed only once // (allowing for page redirects) and specifically suppress its display on // the maintenance mode settings page. - if ($_GET['q'] != 'admin/config/development/maintenance') { + if (!$check_only && $_GET['q'] != 'admin/config/development/maintenance') { if (user_access('administer site configuration')) { drupal_set_message(t('Operating in maintenance mode. Go online.', array('@url' => url('admin/config/development/maintenance'))), 'status', FALSE); } @@ -2858,8 +2913,10 @@ function _menu_site_is_offline() { return ($_GET['q'] != 'user' && $_GET['q'] != 'user/login'); } // Logged in users are unprivileged here, so they are logged out. - require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'user') . '/user.pages.inc'; - user_logout(); + if (!$check_only) { + require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'user') . '/user.pages.inc'; + user_logout(); + } } } return FALSE; Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.514 diff -u -p -r1.514 theme.inc --- includes/theme.inc 24 Aug 2009 00:34:11 -0000 1.514 +++ includes/theme.inc 24 Aug 2009 01:35:45 -0000 @@ -57,7 +57,8 @@ function drupal_theme_initialize() { // Allow modules to override the present theme... only select custom theme // if it is available in the list of installed themes. - $theme = $custom_theme && $themes[$custom_theme] ? $custom_theme : $theme; + $custom_theme = menu_get_custom_theme(); + $theme = $custom_theme && isset($themes[$custom_theme]) ? $custom_theme : $theme; // Store the identifier for retrieving theme settings with. $theme_key = $theme; Index: modules/block/block.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v retrieving revision 1.49 diff -u -p -r1.49 block.admin.inc --- modules/block/block.admin.inc 22 Aug 2009 14:34:18 -0000 1.49 +++ modules/block/block.admin.inc 24 Aug 2009 01:35:45 -0000 @@ -34,11 +34,6 @@ function block_form_system_performance_s * Menu callback for admin/structure/block. */ function block_admin_display($theme = NULL) { - global $custom_theme; - - // If non-default theme configuration has been selected, set the custom theme. - $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland'); - // Fetch and sort blocks. $blocks = _block_rehash(); usort($blocks, '_block_compare'); @@ -50,14 +45,10 @@ function block_admin_display($theme = NU * Generate main blocks administration form. */ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { - global $theme_key, $custom_theme; + global $theme_key; drupal_add_css(drupal_get_path('module', 'block') . '/block.css', array('preprocess' => FALSE)); - // If non-default theme configuration has been selected, set the custom theme. - $custom_theme = isset($theme) ? $theme : variable_get('theme_default', 'garland'); - drupal_theme_initialize(); - $block_regions = system_region_list($theme_key, REGIONS_VISIBLE) + array(BLOCK_REGION_NONE => '<' . t('none') . '>'); // Weights range from -delta to +delta, so delta should be at least half Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.366 diff -u -p -r1.366 block.module --- modules/block/block.module 24 Aug 2009 00:14:19 -0000 1.366 +++ modules/block/block.module 24 Aug 2009 01:35:45 -0000 @@ -125,6 +125,7 @@ function block_menu() { 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', 'page callback' => 'block_admin_display', 'access arguments' => array('administer blocks'), + 'theme callback' => '_block_custom_theme', 'file' => 'block.admin.inc', ); $items['admin/structure/block/list'] = array( @@ -172,6 +173,8 @@ function block_menu() { 'weight' => $key == $default ? -10 : 0, 'access callback' => '_block_themes_access', 'access arguments' => array($theme), + 'theme callback' => '_block_custom_theme', + 'theme arguments' => array($key), 'file' => 'block.admin.inc', ); } @@ -187,6 +190,22 @@ function _block_themes_access($theme) { } /** + * Theme callback for the block configuration pages. + * + * @param $theme + * The theme whose blocks are being configured. If not set, the default theme + * is assumed. + * @return + * The theme that should be used for the block configuration page, or NULL + * to indicate that the default theme should be used. + */ +function _block_custom_theme($theme = NULL) { + // We return exactly what was passed in, to guarantee that the page will + // always be displayed using the theme whose blocks are being configured. + return $theme; +} + +/** * Implement hook_block_list(). */ function block_block_list() { Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.508 diff -u -p -r1.508 book.module --- modules/book/book.module 24 Aug 2009 00:14:19 -0000 1.508 +++ modules/book/book.module 24 Aug 2009 01:35:45 -0000 @@ -1186,7 +1186,7 @@ function book_menu_subtree_data($item) { $menu_router_alias = $query->join('menu_router', 'm', 'm.path = ml.router_path'); $book_alias = $query->join('book', 'b', 'ml.mlid = b.mlid'); $query->fields($book_alias); - $query->fields($menu_router_alias, array('load_functions', 'to_arg_functions', 'access_callback', 'access_arguments', 'page_callback', 'page_arguments', 'title', 'title_callback', 'title_arguments', 'type')); + $query->fields($menu_router_alias, array('load_functions', 'to_arg_functions', 'access_callback', 'access_arguments', 'page_callback', 'page_arguments', 'title', 'title_callback', 'title_arguments', 'theme_callback', 'theme_arguments', 'type')); $query->fields('ml'); $query->condition('menu_name', $item['menu_name']); for ($i = 1; $i <= MENU_MAX_DEPTH && $item["p$i"]; ++$i) { Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.55 diff -u -p -r1.55 menu.admin.inc --- modules/menu/menu.admin.inc 22 Aug 2009 23:18:28 -0000 1.55 +++ modules/menu/menu.admin.inc 24 Aug 2009 01:35:45 -0000 @@ -43,7 +43,7 @@ function theme_menu_admin_overview($titl function menu_overview_form(&$form_state, $menu) { global $menu_admin; $sql = " - SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, m.description, ml.* + SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, m.description, ml.* FROM {menu_links} ml LEFT JOIN {menu_router} m ON m.path = ml.router_path WHERE ml.menu_name = :menu ORDER BY p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC, p6 ASC, p7 ASC, p8 ASC, p9 ASC"; Index: modules/menu/menu.api.php =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.api.php,v retrieving revision 1.9 diff -u -p -r1.9 menu.api.php --- modules/menu/menu.api.php 11 Jul 2009 13:56:21 -0000 1.9 +++ modules/menu/menu.api.php 24 Aug 2009 01:35:45 -0000 @@ -40,6 +40,13 @@ * user_access() unless a value is inherited from a parent menu item. * - "access arguments": An array of arguments to pass to the access callback * function. Integer values pass the corresponding URL component. + * - "theme callback": Optional. A function returning the machine-readable + * name of the theme that will be used to render the page. If the function + * returns nothing, the main site theme will be used. If no function is + * provided, the main site theme will also be used, unless a value is + * inherited from a parent menu item. + * - "theme arguments": An array of arguments to pass to the theme callback + * function. Integer values pass the corresponding URL component. * - "file": A file that will be included before the callbacks are accessed; * this allows callback functions to be in separate files. The file should * be relative to the implementing module's directory unless otherwise Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1110 diff -u -p -r1.1110 node.module --- modules/node/node.module 24 Aug 2009 00:14:21 -0000 1.1110 +++ modules/node/node.module 24 Aug 2009 01:35:46 -0000 @@ -1750,6 +1750,7 @@ function node_menu() { 'access callback' => '_node_add_access', 'weight' => 1, 'menu_name' => 'management', + 'theme callback' => '_node_custom_theme', 'file' => 'node.pages.inc', ); $items['rss.xml'] = array( @@ -1810,6 +1811,7 @@ function node_menu() { 'page arguments' => array(1), 'access callback' => 'node_access', 'access arguments' => array('update', 1), + 'theme callback' => '_node_custom_theme', 'weight' => 1, 'type' => MENU_LOCAL_TASK, 'file' => 'node.pages.inc', @@ -1874,6 +1876,17 @@ function node_page_title($node) { } /** + * Theme callback for creating and editing nodes. + */ +function _node_custom_theme() { + // Use the administration theme if the site is configured to use it for + // nodes. + if (variable_get('node_admin_theme')) { + return system_admin_theme(); + } +} + +/** * Implement hook_init(). */ function node_init() { Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.379 diff -u -p -r1.379 system.install --- modules/system/system.install 24 Aug 2009 00:14:22 -0000 1.379 +++ modules/system/system.install 24 Aug 2009 01:35:46 -0000 @@ -922,6 +922,20 @@ function system_schema() { 'not null' => TRUE, 'default' => '', ), + 'theme_callback' => array( + 'description' => 'A function which returns the name of the theme that will be used to render this page. If left empty, the default theme will be used.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'theme_arguments' => array( + 'description' => 'A serialized array of arguments for the theme callback.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), 'type' => array( 'description' => 'Numeric representation of the type of the menu item, like MENU_LOCAL_TASK.', 'type' => 'int', @@ -2458,6 +2472,17 @@ function system_update_7036() { } /** + * Adds fields to the {menu_router} table to allow custom themes to be set per + * page. + */ +function system_update_7037() { + $ret = array(); + db_add_field($ret, 'menu_router', 'theme_callback', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')); + db_add_field($ret, 'menu_router', 'theme_arguments', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')); + return $ret; +} + +/** * @} End of "defgroup updates-6.x-to-7.x" * The next series of updates should start at 8000. */ Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.766 diff -u -p -r1.766 system.module --- modules/system/system.module 24 Aug 2009 00:14:22 -0000 1.766 +++ modules/system/system.module 24 Aug 2009 01:35:46 -0000 @@ -524,6 +524,7 @@ function system_menu() { 'page callback' => 'system_main_admin_page', 'weight' => 9, 'menu_name' => 'management', + 'theme callback' => 'system_admin_theme', 'file' => 'system.admin.inc', ); $items['admin/compact'] = array( @@ -1327,6 +1328,13 @@ function system_admin_menu_block_access( } /** + * Theme callback for site administration pages. + */ +function system_admin_theme() { + return variable_get('admin_theme'); +} + +/** * Implement hook_filetransfer_backends(). */ function system_filetransfer_backends() { @@ -1439,14 +1447,10 @@ function _system_filetransfer_backend_fo * Implement hook_init(). */ function system_init() { - // Use the administrative theme if the user is looking at a page in the admin/* path. + // Add the CSS for this module. if (arg(0) == 'admin' || (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(1) == 'add' || arg(2) == 'edit'))) { - global $custom_theme; - $custom_theme = variable_get('admin_theme', 0); drupal_add_css(drupal_get_path('module', 'system') . '/admin.css', array('weight' => CSS_SYSTEM)); } - - // Add the CSS for this module. drupal_add_css(drupal_get_path('module', 'system') . '/defaults.css', array('weight' => CSS_SYSTEM)); drupal_add_css(drupal_get_path('module', 'system') . '/system.css', array('weight' => CSS_SYSTEM)); drupal_add_css(drupal_get_path('module', 'system') . '/system-menus.css', array('weight' => CSS_SYSTEM)); @@ -1677,7 +1681,7 @@ function system_admin_menu_block($item) $content = array(); $result = db_query(" - SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, m.description, ml.* + SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, m.description, ml.* FROM {menu_links} ml LEFT JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.plid = :plid AND ml.menu_name = :name AND hidden = 0", array(':plid' => $item['mlid'], ':name' => $item['menu_name']), array('fetch' => PDO::FETCH_ASSOC)); @@ -2340,7 +2344,7 @@ function system_get_module_admin_tasks($ if (empty($items)) { $result = db_query(" - SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.type, ml.* + SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, ml.* FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 2", array(), array('fetch' => PDO::FETCH_ASSOC)); foreach ($result as $item) { _menu_link_translate($item);