Index: modules/block/block.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.module,v
retrieving revision 1.366
diff -u -r1.366 block.module
--- modules/block/block.module 24 Aug 2009 00:14:19 -0000 1.366
+++ modules/block/block.module 26 Aug 2009 07:06:32 -0000
@@ -248,6 +248,7 @@
foreach (array_keys($all_regions) as $region) {
// Prevent sidebar regions from rendering blocks when 'show_blocks' == FALSE.
if (!empty($page['#show_blocks']) || (strpos($region, 'sidebar_') !== 0)) {
+ $page[$region] = array();
// Assign blocks to region.
if ($blocks = block_get_blocks_by_region($region)) {
$page[$region] = $blocks;
Index: modules/toolbar/toolbar.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.module,v
retrieving revision 1.6
diff -u -r1.6 toolbar.module
--- modules/toolbar/toolbar.module 22 Aug 2009 14:34:22 -0000 1.6
+++ modules/toolbar/toolbar.module 26 Aug 2009 07:06:32 -0000
@@ -46,7 +46,7 @@
*
* Add some page classes, so global page theming can adjust to the toolbar.
*/
-function toolbar_preprocess_page(&$vars) {
+function toolbar_preprocess_html(&$vars) {
if (user_access('access toolbar')) {
$vars['classes_array'][] = 'toolbar toolbar-shortcuts';
}
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.31
diff -u -r1.31 page.tpl.php
--- modules/system/page.tpl.php 25 Aug 2009 15:39:13 -0000 1.31
+++ modules/system/page.tpl.php 26 Aug 2009 07:06:32 -0000
@@ -10,48 +10,12 @@
* General utility variables:
* - $base_path: The base URL path of the Drupal installation. At the very
* least, this will always default to /.
- * - $css: An array of CSS files for the current page.
* - $directory: The directory the template is located in, e.g. modules/system
* or themes/garland.
- * - $classes_array: Array of html class attribute values. It is flattened
- * into a string within the variable $classes.
* - $is_front: TRUE if the current page is the front page. Used to toggle the mission statement.
* - $logged_in: TRUE if the user is registered and signed in.
* - $is_admin: TRUE if the user has permission to access administration pages.
*
- * Page metadata:
- * - $language: (object) The language the site is being displayed in.
- * $language->language contains its textual representation.
- * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
- * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
- * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
- * - $head_title: A modified version of the page title, for use in the TITLE tag.
- * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
- * so on).
- * - $styles: Style tags necessary to import all CSS files for the page.
- * - $scripts: Script tags necessary to load the JavaScript files and settings
- * for the page.
- * - $classes: String of classes that can be used to style contextually through
- * CSS. It should be placed within the
tag. When selecting through CSS
- * it's recommended that you use the body tag, e.g., "body.front". It can be
- * manipulated through the variable $classes_array from preprocess functions.
- * The default values can be one or more of the following:
- * - page: The current template type, i.e., "theming hook".
- * - front: Page is the home page.
- * - not-front: Page is not the home page.
- * - logged-in: The current viewer is logged in.
- * - not-logged-in: The current viewer is not logged in.
- * - page-[level 1 path]: The internal first level path. For example, viewing
- * example.com/user/2 would result in "page-user". Path aliases do not apply.
- * - node-type-[node type]: When viewing a single node, the type of that node.
- * For example, if the node is a "Blog entry" it would result in "node-type-blog".
- * Note that the machine name will often be in a short form of the human readable label.
- * The following only apply with the default 'sidebar_first' and 'sidebar_second' block regions:
- * - two-sidebars: When both sidebars have content.
- * - no-sidebars: When no sidebar content exists.
- * - one-sidebar and sidebar-first or sidebar-second: A combination of the two classes
- * when only one of the two sidebars have content.
- *
* Site identity:
* - $front_page: The URL of the front page. Use this instead of $base_path,
* when linking to the front page. This includes the language domain or prefix.
@@ -76,41 +40,22 @@
* - $messages: HTML for status and error messages. Should be displayed prominently.
* - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view
* and edit tabs when displaying a node).
- * - $help: Dynamic help text, mostly for admin pages.
- * - $content: The main content of the current page.
* - $feed_icons: A string of all feed icons for the current page.
- * - $sidebar_first: Items for the first sidebar.
- * - $sidebar_second: Items for the second sidebar.
- * - $highlight: Items for the highlighted content region.
- *
- * Opening and closing data:
- * - $page_top: Initial markup from any modules that have altered the
- * page. This variable should always be output first, before all other dynamic
- * content.
- * - $footer : The footer region.
- * - $page_bottom: Final closing markup from any modules that have altered the
- * page. This variable should always be output last, after all other dynamic
- * content.
*
+ * Regions:
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['highlight']: Items for the highlighted content region.
+ * - $page['content']: The main content of the current page.
+ * - $page['sidebar_first']: Items for the first sidebar.
+ * - $page['sidebar_second']: Items for the second sidebar.
+ * - $page['header']: Items for the header region.
+ * - $page['footer']: Items for the footer region.
+ *
* @see template_preprocess()
* @see template_preprocess_page()
* @see template_process()
*/
?>
-
->
-
-
-
-
-
-
-
-
-
-