- Patch #245115 by kkaefer, John Morahan, JohnAlbin et al: after a long discussion we've decided to make the concatenation operator consistent with the other operators.

author: Dries Buytaert <dries@buytaert.net> 2008-04-14 17:48:46 +0000
committer: Dries Buytaert <dries@buytaert.net> 2008-04-14 17:48:46 +0000
commit: 56d2664a904119f73e7df4fb355e4c525e040b70 (patch)
tree: 0ac2302d485b4b0769d269825880975428bd3b0c /themes
parent: 46cda4c6ae388cd2e918ae2aec887e617e5bd44e (diff)
download: brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.gz
brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.bz2
9 files changed, 38 insertions, 38 deletions
diff --git a/themes/bluemarine/comment.tpl.php b/themes/bluemarine/comment.tpl.php
index bd1249119..013b0afa0 100644
--- a/themes/bluemarine/comment.tpl.php
+++ b/themes/bluemarine/comment.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-  <div class="comment<?php print ' '. $status; ?>">
+  <div class="comment<?php print ' ' . $status; ?>">
     <?php if ($picture) {
     print $picture;
   } ?>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 8f3a51904..7725035f4 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -18,7 +18,7 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
   $direction = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
 
   if (theme_get_setting('toggle_favicon')) {
-    drupal_set_html_head('<link rel="shortcut icon" href="'. check_url(theme_get_setting('favicon')) .'" type="image/x-icon" />');
+    drupal_set_html_head('<link rel="shortcut icon" href="' . check_url(theme_get_setting('favicon')) . '" type="image/x-icon" />');
   }
 
   $title = drupal_get_title();
@@ -30,7 +30,7 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
   $output  = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
   $output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\" dir=\"$direction\">\n";
   $output .= "<head>\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>" . ($title ? strip_tags($title) . " | " . variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") . " | " . variable_get("site_slogan", "")) . "</title>\n";
   $output .= drupal_get_html_head();
   $output .= drupal_get_css();
   $output .= drupal_get_js();
@@ -39,13 +39,13 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
   $output .= " <div id=\"header\">";
 
   if ($logo = theme_get_setting('logo')) {
-    $output .= "  <a href=\"". url() ."\" title=\"". t('Home') ."\"><img src=\"$logo\" alt=\"". t('Home') ."\" /></a>";
+    $output .= "  <a href=\"" . url() . "\" title=\"" . t('Home') . "\"><img src=\"$logo\" alt=\"" . t('Home') . "\" /></a>";
   }
   if (theme_get_setting('toggle_name')) {
-    $output .= "  <h1 class=\"site-name title\">". l(variable_get('site_name', 'drupal'), "") ."</h1>";
+    $output .= "  <h1 class=\"site-name title\">" . l(variable_get('site_name', 'drupal'), "") . "</h1>";
   }
   if (theme_get_setting('toggle_slogan')) {
-    $output .= "  <div class=\"site-slogan\">". variable_get('site_slogan', '') ."</div>";
+    $output .= "  <div class=\"site-slogan\">" . variable_get('site_slogan', '') . "</div>";
   }
 
   $output .= "</div>\n";
@@ -114,10 +114,10 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
 
 function chameleon_node($node, $teaser = 0, $page = 0) {
 
-  $output  = "<div class=\"node". ((!$node->status) ? ' node-unpublished' : '') . (($node->sticky) ? ' sticky' : '') ."\">\n";
+  $output  = "<div class=\"node" . ((!$node->status) ? ' node-unpublished' : '') . (($node->sticky) ? ' sticky' : '') . "\">\n";
 
   if (!$page) {
-    $output .= " <h2 class=\"title\">". ($teaser ? l($node->title, "node/$node->nid") : check_plain($node->title)) ."</h2>\n";
+    $output .= " <h2 class=\"title\">" . ($teaser ? l($node->title, "node/$node->nid") : check_plain($node->title)) . "</h2>\n";
   }
 
   $output .= " <div class=\"content\">\n";
@@ -145,7 +145,7 @@ function chameleon_node($node, $teaser = 0, $page = 0) {
     $links = array_merge($links, $node->links);
   }
   if (count($links)) {
-    $output .= '<div class="links">'. theme('links', $links, array('class' => 'links inline')) ."</div>\n";
+    $output .= '<div class="links">' . theme('links', $links, array('class' => 'links inline')) . "</div>\n";
   }
 
   $output .= "</div>\n";
@@ -158,17 +158,17 @@ function chameleon_comment($comment, $node, $links = array()) {
     'title' => t('By !author at @date', array('!author' => theme('username', $comment), '@date' => format_date($comment->timestamp, 'small'))),
     'html' => TRUE);
 
-  $output  = "<div class=\"comment". ' '. $status ."\">\n";
-  $output .= " <h3 class=\"title\">". l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) ."</h3>\n";
-  $output .= " <div class=\"content\">". $comment->comment;
+  $output  = "<div class=\"comment" . ' ' . $status . "\">\n";
+  $output .= " <h3 class=\"title\">" . l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) . "</h3>\n";
+  $output .= " <div class=\"content\">" . $comment->comment;
   if (!empty($signature)) {
     $output .= "  <div class=\"clear-block\">";
     $output .= "<div>—</div>\n";
-    $output .= $signature ."\n";
+    $output .= $signature . "\n";
     $output .= "  </div>\n";
   }
   $output .= " </div>\n";
-  $output .= " <div class=\"links\">". theme('links', array_merge($submitted, $links)) ."</div>\n";
+  $output .= " <div class=\"links\">" . theme('links', array_merge($submitted, $links)) . "</div>\n";
   $output .= "</div>\n";
 
   return $output;
@@ -176,7 +176,7 @@ function chameleon_comment($comment, $node, $links = array()) {
 
 function chameleon_help() {
   if ($help = menu_get_active_help()) {
-    return '<div class="help">'. $help .'</div><hr />';
+    return '<div class="help">' . $help . '</div><hr />';
   }
 }
 
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index 4d638d18f..ed34815a8 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -7,7 +7,7 @@
  */
 
 function phptemplate_init($template) {
-  $file = dirname($template->filename) .'/template.php';
+  $file = dirname($template->filename) . '/template.php';
   if (file_exists($file)) {
     include_once "./$file";
   }
diff --git a/themes/garland/block.tpl.php b/themes/garland/block.tpl.php
index 1b7ae308e..8bbd37118 100644
--- a/themes/garland/block.tpl.php
+++ b/themes/garland/block.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="clear-block block block-<?php print $block->module ?>">
+<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="clear-block block block-<?php print $block->module ?>">
 
 <?php if (!empty($block->subject)): ?>
   <h2><?php print $block->subject ?></h2>
diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index ea83a24d8..ab68a8cf7 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' '. $status; print ' '. $zebra; ?>">
+<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' ' . $status; print ' ' . $zebra; ?>">
 
   <div class="clear-block">
   <?php if ($submitted): ?>
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
index e3d1b9d66..e299fc92e 100644
--- a/themes/garland/maintenance-page.tpl.php
+++ b/themes/garland/maintenance-page.tpl.php
@@ -44,16 +44,16 @@
           }
           $site_title = implode(' ', $site_fields);
           if ($site_fields) {
-            $site_fields[0] = '<span>'. $site_fields[0] .'</span>';
+            $site_fields[0] = '<span>' . $site_fields[0] . '</span>';
           }
           $site_html = implode(' ', $site_fields);
 
           if ($logo || $site_title) {
-            print '<h1><a href="'. check_url($base_path) .'" title="'. $site_title .'">';
+            print '<h1><a href="' . check_url($base_path) . '" title="' . $site_title . '">';
             if ($logo) {
-              print '<img src="'. check_url($logo) .'" alt="'. $site_title .'" id="logo" />';
+              print '<img src="' . check_url($logo) . '" alt="' . $site_title . '" id="logo" />';
             }
-            print $site_html .'</a></h1>';
+            print $site_html . '</a></h1>';
           }
         ?>
         </div>
@@ -68,7 +68,7 @@
       <?php endif; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
-          <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
+          <?php if ($title): print '<h2' . ($tabs ? ' class="with-tabs"' : '') . '>' . $title . '</h2>'; endif; ?>
           <?php print $help; ?>
           <?php print $messages; ?>
           <div class="clear-block">
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 92559d814..5aed7ccc9 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -33,16 +33,16 @@
           }
           $site_title = implode(' ', $site_fields);
           if ($site_fields) {
-            $site_fields[0] = '<span>'. $site_fields[0] .'</span>';
+            $site_fields[0] = '<span>' . $site_fields[0] . '</span>';
           }
           $site_html = implode(' ', $site_fields);
 
           if ($logo || $site_title) {
-            print '<h1><a href="'. check_url($front_page) .'" title="'. $site_title .'">';
+            print '<h1><a href="' . check_url($front_page) . '" title="' . $site_title . '">';
             if ($logo) {
-              print '<img src="'. check_url($logo) .'" alt="'. $site_title .'" id="logo" />';
+              print '<img src="' . check_url($logo) . '" alt="' . $site_title . '" id="logo" />';
             }
-            print $site_html .'</a></h1>';
+            print $site_html . '</a></h1>';
           }
         ?>
         </div>
@@ -65,11 +65,11 @@
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
           <?php print $breadcrumb; ?>
-          <?php if ($mission): print '<div id="mission">'. $mission .'</div>'; endif; ?>
+          <?php if ($mission): print '<div id="mission">' . $mission . '</div>'; endif; ?>
           <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
-          <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
-          <?php if ($tabs): print '<ul class="tabs primary">'. $tabs .'</ul></div>'; endif; ?>
-          <?php if ($tabs2): print '<ul class="tabs secondary">'. $tabs2 .'</ul>'; endif; ?>
+          <?php if ($title): print '<h2' . ($tabs ? ' class="with-tabs"' : '') . '>' . $title . '</h2>'; endif; ?>
+          <?php if ($tabs): print '<ul class="tabs primary">' . $tabs . '</ul></div>'; endif; ?>
+          <?php if ($tabs2): print '<ul class="tabs secondary">' . $tabs2 . '</ul>'; endif; ?>
           <?php if ($show_messages && $messages): print $messages; endif; ?>
           <?php print $help; ?>
           <div class="clear-block">
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 0d06bb44e..a38ba1519 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -20,7 +20,7 @@ function phptemplate_body_class($left, $right) {
   }
 
   if (isset($class)) {
-    print ' class="'. $class .'"';
+    print ' class="' . $class . '"';
   }
 }
 
@@ -33,7 +33,7 @@ function phptemplate_body_class($left, $right) {
  */
 function phptemplate_breadcrumb($breadcrumb) {
   if (!empty($breadcrumb)) {
-    return '<div class="breadcrumb">'. implode(' › ', $breadcrumb) .'</div>';
+    return '<div class="breadcrumb">' . implode(' › ', $breadcrumb) . '</div>';
   }
 }
 
@@ -42,10 +42,10 @@ function phptemplate_breadcrumb($breadcrumb) {
  */
 function phptemplate_comment_wrapper($content, $node) {
   if (!$content || $node->type == 'forum') {
-    return '<div id="comments">'. $content .'</div>';
+    return '<div id="comments">' . $content . '</div>';
   }
   else {
-    return '<div id="comments"><h2 class="comments">'. t('Comments') .'</h2>'. $content .'</div>';
+    return '<div id="comments"><h2 class="comments">' . t('Comments') . '</h2>' . $content . '</div>';
   }
 }
 
@@ -93,9 +93,9 @@ function phptemplate_node_submitted($node) {
 function phptemplate_get_ie_styles() {
   global $language;
 
-  $iecss = '<link type="text/css" rel="stylesheet" media="all" href="'. base_path() . path_to_theme() .'/fix-ie.css" />';
+  $iecss = '<link type="text/css" rel="stylesheet" media="all" href="' . base_path() . path_to_theme() . '/fix-ie.css" />';
   if (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) {
-    $iecss .= '<style type="text/css" media="all">@import "'. base_path() . path_to_theme() .'/fix-ie-rtl.css";</style>';
+    $iecss .= '<style type="text/css" media="all">@import "' . base_path() . path_to_theme() . '/fix-ie-rtl.css";</style>';
   }
 
   return $iecss;
diff --git a/themes/pushbutton/comment.tpl.php b/themes/pushbutton/comment.tpl.php
index 264561b69..5e9ca7a4a 100644
--- a/themes/pushbutton/comment.tpl.php
+++ b/themes/pushbutton/comment.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-<div class="comment<?php print ' '. $status; ?>">
+<div class="comment<?php print ' ' . $status; ?>">
   <?php if ($picture) : ?>
     <?php print $picture ?>
   <?php endif; ?>
author	Dries Buytaert <dries@buytaert.net>	2008-04-14 17:48:46 +0000
committer	Dries Buytaert <dries@buytaert.net>	2008-04-14 17:48:46 +0000
commit	56d2664a904119f73e7df4fb355e4c525e040b70 (patch)
tree	0ac2302d485b4b0769d269825880975428bd3b0c /themes
parent	46cda4c6ae388cd2e918ae2aec887e617e5bd44e (diff)
download	brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.gz brdo-56d2664a904119f73e7df4fb355e4c525e040b70.tar.bz2