Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.469
diff -u -p -r1.469 theme.inc
--- includes/theme.inc 5 Feb 2009 03:42:56 -0000 1.469
+++ includes/theme.inc 20 Feb 2009 15:32:02 -0000
@@ -1830,6 +1830,11 @@ function template_preprocess_page(&$vari
$variables[$region_key] = empty($variables['page'][$region_key]) ? '' : drupal_render($variables['page'][$region_key]);
}
+ // Render the content variable.
+ if (!isset($variables['content'])) {
+ $variables['content'] = empty($variables['page']['content']) ? '' : drupal_render($variables['page']['content']);
+ }
+
// Add favicon.
if (theme_get_setting('toggle_favicon')) {
drupal_set_html_head('');
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.16
diff -u -p -r1.16 page.tpl.php
--- modules/system/page.tpl.php 18 Feb 2009 14:28:23 -0000 1.16
+++ modules/system/page.tpl.php 20 Feb 2009 15:32:03 -0000
@@ -11,8 +11,8 @@
* - $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 theme is located in, e.g. themes/garland or
- * themes/garland/minelli.
+ * - $directory: The directory the template is located in, e.g. modules/system
+ * or themes/garland.
* - $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.
@@ -48,23 +48,20 @@
* site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured.
+ * - $breadcrumb: The breadcrumb trail for the current page.
*
* Page content (in order of occurrence in the default page.tpl.php):
- * - $left: The HTML for the left sidebar.
- *
- * - $breadcrumb: The breadcrumb trail for the current page.
* - $title: The page title, for use in the actual HTML content.
- * - $help: Dynamic help text, mostly for admin pages.
* - $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 Drupal page.
- *
+ * - $feed_icons: A string of all feed icons for the current page.
+ * - $left: The HTML for the left sidebar.
* - $right: The HTML for the right sidebar.
*
* Footer/closing data:
- * - $feed_icons: A string of all feed icons for the current page.
* - $footer_message: The footer message as defined in the admin settings.
* - $footer : The footer region.
* - $closure: Final closing markup from any modules that have altered the page.
@@ -76,7 +73,7 @@
?>
-
+