Index: themes/chameleon/chameleon.theme
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v
retrieving revision 1.88
diff -u -p -r1.88 chameleon.theme
--- themes/chameleon/chameleon.theme	26 Jan 2009 14:08:44 -0000	1.88
+++ themes/chameleon/chameleon.theme	30 Jan 2009 13:20:08 -0000
@@ -32,7 +32,16 @@ function chameleon_page($content, $show_
   $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"$language\" dir=\"$direction\"\n";
   $output .= "  $rdf_namespaces>\n";
   $output .= "<head profile=\"http://ns.inria.fr/grddl/rdfa/\">\n";
-  $output .= " <title>" . ($title ? strip_tags($title) . " | " . variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") . " | " . variable_get("site_slogan", "")) . "</title>\n";
+  $output .= " <title>";
+  if ($title) {
+    $output .= strip_tags($title) . " | " . variable_get("site_name", "Drupal");
+  } else {
+    $output .= variable_get("site_name", "Drupal");
+    if (variable_get("site_slogan", "")) {
+      $output .= " | ". variable_get("site_slogan", "");
+    }
+  }
+  $output .= "</title>\n";
   $output .= drupal_get_html_head();
   $output .= drupal_get_css();
   $output .= drupal_get_js();
