From f7440d4d73ec57219af232c135be3b2567dda45f Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 27 Mar 2007 05:13:55 +0000
Subject: #130971: Kitchen sink (E_NOTICE compliance / Code style / Bugfix in
 book toc)

---
 themes/engines/phptemplate/phptemplate.engine | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'themes/engines/phptemplate/phptemplate.engine')

diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 7d7438e8f..329762d8d 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -202,15 +202,15 @@ function phptemplate_page($content, $show_blocks = TRUE) {
     'head_title'          => implode(' | ', $head_title),
     'help'                => theme('help'),
     'language'            => $GLOBALS['language'],
-    'layout'              => $layout,
+    'layout'              => isset($layout) ? $layout : NULL,
     'logo'                => theme_get_setting('logo'),
     'messages'            => theme('status_messages'),
     'mission'             => isset($mission) ? $mission : '',
     'primary_links'       => menu_primary_links(),
     'search_box'          => (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''),
     'secondary_links'     => menu_secondary_links(),
-    'sidebar_left'        => $sidebar_left,
-    'sidebar_right'       => $sidebar_right,
+    'sidebar_left'        => !empty($sidebar_left) ? $sidebar_left : '',
+    'sidebar_right'       => !empty($sidebar_right) ? $sidebar_right : '',
     'site_name'           => (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''),
     'site_slogan'         => (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''),
     'css'                 => drupal_add_css(),
@@ -261,11 +261,20 @@ function phptemplate_node($node, $teaser = 0, $page = 0) {
   else {
     $taxonomy = array();
   }
+  if ($teaser && $node->teaser) {
+    $content = $node->teaser;
+  }
+  elseif (isset($node->body)) {
+    $content = $node->body;
+  }
+  else {
+    $content = '';
+  }
 
   $variables = array(
-    'content'        => ($teaser && $node->teaser) ? $node->teaser : $node->body,
+    'content'        => $content,
     'date'           => format_date($node->created),
-    'links'          => $node->links ? theme('links', $node->links, array('class' => 'links inline')) : '',
+    'links'          => !empty($node->links) ? theme('links', $node->links, array('class' => 'links inline')) : '',
     'name'           => theme('username', $node),
     'node'           => $node,  // we pass the actual node to allow more customization
     'node_url'       => url('node/'. $node->nid),
-- 
cgit v1.2.3