? .DS_Store
? .htaccess
? remove_endif_from_tpl.patch
? sites
Index: modules/aggregator/aggregator-item.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-item.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 aggregator-item.tpl.php
--- modules/aggregator/aggregator-item.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-item.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -25,22 +25,22 @@
   </h3>
 
   <div class="feed-item-meta">
-  <?php if ($source_url) : ?>
+  <?php if ($source_url) { ?>
     <a href="<?php print $source_url; ?>" class="feed-item-source"><?php print $source_title; ?></a> -
-  <?php endif; ?>
+  <?php }; ?>
     <span class="feed-item-date"><?php print $source_date; ?></span>
   </div>
 
-<?php if ($content) : ?>
+<?php if ($content) { ?>
   <div class="feed-item-body">
     <?php print $content; ?>
   </div>
-<?php endif; ?>
+<?php }; ?>
 
-<?php if ($categories) : ?>
+<?php if ($categories) { ?>
   <div class="feed-item-categories">
     <?php print t('Categories'); ?>: <?php print implode(', ', $categories); ?>
   </div>
-<?php endif ;?>
+<?php }; ?>
 
 </div>
Index: modules/aggregator/aggregator-summary-item.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-summary-item.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 aggregator-summary-item.tpl.php
--- modules/aggregator/aggregator-summary-item.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-summary-item.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -19,6 +19,6 @@
 <a href="<?php print $feed_url; ?>"><?php print $feed_title; ?></a>
 <span class="age"><?php print $feed_age; ?></span>
 
-<?php if ($source_url) : ?>,
+<?php if ($source_url) { ?>,
 <span class="source"><a href="<?php print $source_url; ?>"><?php print $source_title; ?></a></span>
-<?php endif; ?>
+<?php }; ?>
Index: modules/block/block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 block.tpl.php
--- modules/block/block.tpl.php	12 Jun 2009 09:02:55 -0000	1.3
+++ modules/block/block.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -36,9 +36,9 @@
  */
 ?>
 <div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?>">
-<?php if ($block->subject): ?>
+<?php if ($block->subject) { ?>
   <h2><?php print $block->subject ?></h2>
-<?php endif;?>
+<?php };?>
 
   <div class="content">
     <?php print $content ?>
Index: modules/book/book-export-html.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-export-html.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 book-export-html.tpl.php
--- modules/book/book-export-html.tpl.php	15 May 2008 21:19:24 -0000	1.2
+++ modules/book/book-export-html.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -24,9 +24,9 @@
     <?php print $head; ?>
     <base href="<?php print $base_url; ?>" />
     <link type="text/css" rel="stylesheet" href="misc/print.css" />
-    <?php if ($language_rtl): ?>
+    <?php if ($language_rtl) { ?>
       <link type="text/css" rel="stylesheet" href="misc/print-rtl.css" />
-    <?php endif; ?>
+    <?php }; ?>
   </head>
   <body>
     <?php
Index: modules/book/book-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-navigation.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 book-navigation.tpl.php
--- modules/book/book-navigation.tpl.php	18 Feb 2009 14:28:21 -0000	1.3
+++ modules/book/book-navigation.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -30,23 +30,23 @@
  * @see template_preprocess_book_navigation()
  */
 ?>
-<?php if ($tree || $has_links): ?>
+<?php if ($tree || $has_links) { ?>
   <div id="book-navigation-<?php print $book_id; ?>" class="book-navigation">
     <?php print $tree; ?>
 
-    <?php if ($has_links): ?>
+    <?php if ($has_links) { ?>
     <div class="page-links clearfix">
-      <?php if ($prev_url) : ?>
+      <?php if ($prev_url) { ?>
         <a href="<?php print $prev_url; ?>" class="page-previous" title="<?php print t('Go to previous page'); ?>"><?php print t('‹ ') . $prev_title; ?></a>
-      <?php endif; ?>
-      <?php if ($parent_url) : ?>
+      <?php }; ?>
+      <?php if ($parent_url) { ?>
         <a href="<?php print $parent_url; ?>" class="page-up" title="<?php print t('Go to parent page'); ?>"><?php print t('up'); ?></a>
-      <?php endif; ?>
-      <?php if ($next_url) : ?>
+      <?php }; ?>
+      <?php if ($next_url) { ?>
         <a href="<?php print $next_url; ?>" class="page-next" title="<?php print t('Go to next page'); ?>"><?php print $next_title . t(' ›'); ?></a>
-      <?php endif; ?>
+      <?php }; ?>
     </div>
-    <?php endif; ?>
+    <?php }; ?>
 
   </div>
-<?php endif; ?>
+<?php }; ?>
Index: modules/comment/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.tpl.php,v
retrieving revision 1.9
diff -u -p -r1.9 comment.tpl.php
--- modules/comment/comment.tpl.php	28 May 2009 16:44:06 -0000	1.9
+++ modules/comment/comment.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -46,9 +46,9 @@
 <div class="<?php print $classes; ?> clearfix">
   <?php print $picture ?>
 
-  <?php if ($comment->new): ?>
+  <?php if ($comment->new) { ?>
     <span class="new"><?php print $new ?></span>
-  <?php endif; ?>
+  <?php }; ?>
 
   <h3><?php print $title ?></h3>
 
@@ -58,11 +58,11 @@
 
   <div class="content">
     <?php print $content ?>
-    <?php if ($signature): ?>
+    <?php if ($signature) { ?>
     <div class="user-signature clearfix">
       <?php print $signature ?>
     </div>
-    <?php endif; ?>
+    <?php }; ?>
   </div>
 
   <?php print $links ?>
Index: modules/field/theme/field.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/theme/field.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 field.tpl.php
--- modules/field/theme/field.tpl.php	22 Jun 2009 09:10:04 -0000	1.3
+++ modules/field/theme/field.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -25,15 +25,15 @@
  * @see template_preprocess_field()
  */
 ?>
-<?php if (!$field_empty) : ?>
+<?php if (!$field_empty) { ?>
 <div class="field field-type-<?php print $field_type_css ?> field-<?php print $field_name_css ?>">
-  <?php if ($label_display == 'above') : ?>
+  <?php if ($label_display == 'above') { ?>
     <div class="field-label"><?php print t($label) ?>:&nbsp;</div>
-  <?php endif;?>
+  <?php };?>
   <div class="field-items">
     <?php $count = 1;
-    foreach ($items as $delta => $item) :
-      if (!$item['empty']) : ?>
+    foreach ($items as $delta => $item) {
+      if (!$item['empty']) { ?>
         <div class="field-item <?php print ($count % 2 ? 'odd' : 'even') ?>">
           <?php if ($label_display == 'inline') { ?>
             <div class="field-label-inline<?php print($delta ? '' : '-first')?>">
@@ -42,8 +42,8 @@
           <?php print $item['view'] ?>
         </div>
       <?php $count++;
-      endif;
-    endforeach;?>
+      };
+    };?>
   </div>
 </div>
-<?php endif; ?>
+<?php }; ?>
Index: modules/forum/forum-icon.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-icon.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 forum-icon.tpl.php
--- modules/forum/forum-icon.tpl.php	8 Mar 2009 20:58:19 -0000	1.5
+++ modules/forum/forum-icon.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -14,12 +14,12 @@
  * @see theme_forum_icon()
  */
 ?>
-<?php if ($new_posts): ?>
+<?php if ($new_posts) { ?>
   <a id="new">
-<?php endif; ?>
+<?php }; ?>
 
 <?php print theme('image', "misc/forum-$icon.png") ?>
 
-<?php if ($new_posts): ?>
+<?php if ($new_posts) { ?>
   </a>
-<?php endif; ?>
+<?php }; ?>
Index: modules/forum/forum-list.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-list.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 forum-list.tpl.php
--- modules/forum/forum-list.tpl.php	13 Oct 2008 12:31:42 -0000	1.5
+++ modules/forum/forum-list.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -41,7 +41,7 @@
     </tr>
   </thead>
   <tbody>
-  <?php foreach ($forums as $child_id => $forum): ?>
+  <?php foreach ($forums as $child_id => $forum) { ?>
     <tr id="forum-list-<?php print $child_id; ?>" class="<?php print $forum->zebra; ?>">
       <td <?php print $forum->is_container ? 'colspan="4" class="container"' : 'class="forum"'; ?>>
         <?php /* Enclose the contents of this cell with X divs, where X is the
@@ -50,23 +50,23 @@
                */ ?>
         <?php print str_repeat('<div class="indent">', $forum->depth); ?>
           <div class="name"><a href="<?php print $forum->link; ?>"><?php print $forum->name; ?></a></div>
-          <?php if ($forum->description): ?>
+          <?php if ($forum->description) { ?>
             <div class="description"><?php print $forum->description; ?></div>
-          <?php endif; ?>
+          <?php }; ?>
         <?php print str_repeat('</div>', $forum->depth); ?>
       </td>
-      <?php if (!$forum->is_container): ?>
+      <?php if (!$forum->is_container) { ?>
         <td class="topics">
           <?php print $forum->num_topics ?>
-          <?php if ($forum->new_topics): ?>
+          <?php if ($forum->new_topics) { ?>
             <br />
             <a href="<?php print $forum->new_url; ?>"><?php print $forum->new_text; ?></a>
-          <?php endif; ?>
+          <?php }; ?>
         </td>
         <td class="posts"><?php print $forum->num_posts ?></td>
         <td class="last-reply"><?php print $forum->last_reply ?></td>
-      <?php endif; ?>
+      <?php }; ?>
     </tr>
-  <?php endforeach; ?>
+  <?php }; ?>
   </tbody>
 </table>
Index: modules/forum/forum-submitted.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-submitted.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 forum-submitted.tpl.php
--- modules/forum/forum-submitted.tpl.php	13 Oct 2008 12:31:42 -0000	1.4
+++ modules/forum/forum-submitted.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -17,12 +17,14 @@
  * @see theme_forum_submitted()
  */
 ?>
-<?php if ($time): ?>
-  <?php print t(
-  '@time ago<br />by !author', array(
-    '@time' => $time,
-    '!author' => $author,
-    )); ?>
-<?php else: ?>
-  <?php print t('n/a'); ?>
-<?php endif; ?>
+<?php if ($time) {
+        print t(
+          '@time ago<br />by !author', array(
+            '@time' => $time,
+            '!author' => $author,
+           )
+        ); 
+    }
+    else {
+        print t('n/a');
+    }; ?>
Index: modules/forum/forum-topic-list.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-topic-list.tpl.php,v
retrieving revision 1.6
diff -u -p -r1.6 forum-topic-list.tpl.php
--- modules/forum/forum-topic-list.tpl.php	22 Oct 2008 18:22:22 -0000	1.6
+++ modules/forum/forum-topic-list.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -38,25 +38,26 @@
     <tr><?php print $header; ?></tr>
   </thead>
   <tbody>
-  <?php foreach ($topics as $topic): ?>
+  <?php foreach ($topics as $topic) { ?>
     <tr class="<?php print $topic->zebra;?>">
       <td class="icon"><?php print $topic->icon; ?></td>
       <td class="title"><?php print $topic->title; ?></td>
-    <?php if ($topic->moved): ?>
+    <?php if ($topic->moved) { ?>
       <td colspan="3"><?php print $topic->message; ?></td>
-    <?php else: ?>
+    <?php }
+          else { ?>
       <td class="replies">
         <?php print $topic->num_comments; ?>
-        <?php if ($topic->new_replies): ?>
+        <?php if ($topic->new_replies) { ?>
           <br />
           <a href="<?php print $topic->new_url; ?>"><?php print $topic->new_text; ?></a>
-        <?php endif; ?>
+        <?php }; ?>
       </td>
       <td class="created"><?php print $topic->created; ?></td>
       <td class="last-reply"><?php print $topic->last_reply; ?></td>
-    <?php endif; ?>
+    <?php }; ?>
     </tr>
-  <?php endforeach; ?>
+  <?php }; ?>
   </tbody>
 </table>
 <?php print $pager; ?>
Index: modules/forum/forum-topic-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum-topic-navigation.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 forum-topic-navigation.tpl.php
--- modules/forum/forum-topic-navigation.tpl.php	18 Feb 2009 14:28:22 -0000	1.4
+++ modules/forum/forum-topic-navigation.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -23,13 +23,13 @@
  * @see theme_forum_topic_navigation()
  */
 ?>
-<?php if ($prev || $next): ?>
+<?php if ($prev || $next) { ?>
   <div class="forum-topic-navigation clearfix">
-    <?php if ($prev): ?>
+    <?php if ($prev) { ?>
       <a href="<?php print $prev_url; ?>" class="topic-previous" title="<?php print t('Go to previous forum topic') ?>">‹ <?php print $prev_title ?></a>
-    <?php endif; ?>
-    <?php if ($next): ?>
+    <?php }; ?>
+    <?php if ($next) { ?>
       <a href="<?php print $next_url; ?>" class="topic-next" title="<?php print t('Go to next forum topic') ?>"><?php print $next_title ?> ›</a>
-    <?php endif; ?>
+    <?php }; ?>
   </div>
-<?php endif; ?>
+<?php }; ?>
Index: modules/forum/forums.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forums.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 forums.tpl.php
--- modules/forum/forums.tpl.php	13 Oct 2008 12:31:42 -0000	1.5
+++ modules/forum/forums.tpl.php	6 Jul 2009 19:46:44 -0000
@@ -18,10 +18,10 @@
  * @see theme_forums()
  */
 ?>
-<?php if ($forums_defined): ?>
+<?php if ($forums_defined) { ?>
 <div id="forum">
   <?php print theme('links', $links); ?>
   <?php print $forums; ?>
   <?php print $topics; ?>
 </div>
-<?php endif; ?>
+<?php }; ?>
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.16
diff -u -p -r1.16 node.tpl.php
--- modules/node/node.tpl.php	30 Jun 2009 17:18:10 -0000	1.16
+++ modules/node/node.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -72,18 +72,18 @@
 
 <?php print $picture ?>
 
-<?php if (!$page): ?>
+<?php if (!$page) { ?>
   <h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
+<?php }; ?>
 
   <div class="meta">
-  <?php if ($submitted): ?>
+  <?php if ($submitted) { ?>
     <span class="submitted"><?php print $submitted ?></span>
-  <?php endif; ?>
+  <?php }; ?>
 
-  <?php if (!empty($content['links']['terms'])): ?>
+  <?php if (!empty($content['links']['terms'])) { ?>
     <div class="terms terms-inline"><?php render($content['links']['terms']) ?></div>
-  <?php endif;?>
+  <?php };?>
   </div>
 
   <div class="content">
Index: modules/poll/poll-results.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll-results.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 poll-results.tpl.php
--- modules/poll/poll-results.tpl.php	13 Oct 2008 12:31:42 -0000	1.3
+++ modules/poll/poll-results.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -23,7 +23,7 @@
   <div class="total">
     <?php print t('Total votes: @votes', array('@votes' => $votes)); ?>
   </div>
-  <?php if (!empty($cancel_form)): ?>
+  <?php if (!empty($cancel_form)) { ?>
     <?php print $cancel_form; ?>
-  <?php endif; ?>
+  <?php }; ?>
 </div>
Index: modules/poll/poll-vote.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll-vote.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 poll-vote.tpl.php
--- modules/poll/poll-vote.tpl.php	13 Jun 2009 19:38:42 -0000	1.4
+++ modules/poll/poll-vote.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -18,9 +18,9 @@
 <div class="poll">
   <div class="vote-form">
     <div class="choices">
-      <?php if ($block): ?>
+      <?php if ($block) { ?>
         <div class="title"><?php print $title; ?></div>
-      <?php endif; ?>
+      <?php }; ?>
       <?php print $choice; ?>
     </div>
     <?php print $vote; ?>
Index: modules/profile/profile-block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile-block.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 profile-block.tpl.php
--- modules/profile/profile-block.tpl.php	13 Oct 2008 12:31:42 -0000	1.3
+++ modules/profile/profile-block.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -20,23 +20,23 @@
  * all accounts may have a value for a profile so do a check first. If a field
  * of "last_name" was set for the site, the following can be used.
  *
- *  <?php if (isset($profile['last_name'])): ?>
+ *  <?php if (isset($profile['last_name'])) { ?>
  *    <div class="field last-name">
  *      <?php print $profile['last_name']->title; ?>:<br />
  *      <?php print $profile['last_name']->value; ?>
  *    </div>
- *  <?php endif; ?>
+ *  <?php }; ?>
  *
  * @see template_preprocess_profile_block()
  */
 ?>
 <?php print $picture; ?>
 
-<?php foreach ($profile as $field) : ?>
+<?php foreach ($profile as $field) { ?>
   <p>
-    <?php if ($field->type != 'checkbox') : ?>
+    <?php if ($field->type != 'checkbox') { ?>
       <strong><?php print $field->title; ?></strong><br />
-    <?php endif; ?>
+    <?php }; ?>
     <?php print $field->value; ?>
   </p>
-<?php endforeach; ?>
+<?php }; ?>
Index: modules/profile/profile-listing.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile-listing.tpl.php,v
retrieving revision 1.6
diff -u -p -r1.6 profile-listing.tpl.php
--- modules/profile/profile-listing.tpl.php	7 May 2009 10:39:38 -0000	1.6
+++ modules/profile/profile-listing.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -27,12 +27,12 @@
  * all accounts may have a value for a profile so do a check first. If a field
  * of "last_name" was set for the site, the following can be used.
  *
- *  <?php if (isset($profile['last_name'])): ?>
+ *  <?php if (isset($profile['last_name'])) { ?>
  *    <div class="field last-name">
  *      <?php print $profile['last_name']->title; ?>:<br />
  *      <?php print $profile['last_name']->value; ?>
  *    </div>
- *  <?php endif; ?>
+ *  <?php }; ?>
  *
  * @see template_preprocess_profile_listing()
  */
@@ -44,10 +44,10 @@
     <?php print $name; ?>
   </div>
 
-  <?php foreach ($profile as $field) : ?>
+  <?php foreach ($profile as $field) { ?>
     <div class="field">
       <?php print $field->value; ?>
     </div>
-  <?php endforeach; ?>
+  <?php }; ?>
 
 </div>
Index: modules/search/search-block-form.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search-block-form.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 search-block-form.tpl.php
--- modules/search/search-block-form.tpl.php	30 Dec 2008 16:43:18 -0000	1.3
+++ modules/search/search-block-form.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -20,11 +20,11 @@
  * Modules can add to the search form so it is recommended to check for their
  * existence before printing. The default keys will always exist.
  *
- *   <?php if (isset($search['extra_field'])): ?>
+ *   <?php if (isset($search['extra_field'])) { ?>
  *     <div class="extra-field">
  *       <?php print $search['extra_field']; ?>
  *     </div>
- *   <?php endif; ?>
+ *   <?php }; ?>
  *
  * To check for all available data within $search, use the code below.
  *
Index: modules/search/search-result.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search-result.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 search-result.tpl.php
--- modules/search/search-result.tpl.php	30 Dec 2008 16:43:18 -0000	1.4
+++ modules/search/search-result.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -33,11 +33,11 @@
  * for their existence before printing. The default keys of 'type', 'user' and
  * 'date' always exist for node searches. Modules may provide other data.
  *
- *   <?php if (isset($info_split['comment'])) : ?>
+ *   <?php if (isset($info_split['comment'])) { ?>
  *     <span class="info-comment">
  *       <?php print $info_split['comment']; ?>
  *     </span>
- *   <?php endif; ?>
+ *   <?php }; ?>
  *
  * To check for all available data within $info_split, use the code below.
  *
@@ -50,10 +50,10 @@
   <a href="<?php print $url; ?>"><?php print $title; ?></a>
 </dt>
 <dd>
-  <?php if ($snippet) : ?>
+  <?php if ($snippet) { ?>
     <p class="search-snippet"><?php print $snippet; ?></p>
-  <?php endif; ?>
-  <?php if ($info) : ?>
+  <?php }; ?>
+  <?php if ($info) { ?>
   <p class="search-info"><?php print $info; ?></p>
-  <?php endif; ?>
+  <?php }; ?>
 </dd>
Index: modules/search/search-theme-form.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search-theme-form.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 search-theme-form.tpl.php
--- modules/search/search-theme-form.tpl.php	30 Dec 2008 16:43:18 -0000	1.3
+++ modules/search/search-theme-form.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -20,11 +20,11 @@
  * Modules can add to the search form so it is recommended to check for their
  * existence before printing. The default keys will always exist.
  *
- *   <?php if (isset($search['extra_field'])): ?>
+ *   <?php if (isset($search['extra_field'])) { ?>
  *     <div class="extra-field">
  *       <?php print $search['extra_field']; ?>
  *     </div>
- *   <?php endif; ?>
+ *   <?php }; ?>
  *
  * To check for all available data within $search, use the code below.
  *
Index: modules/system/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/maintenance-page.tpl.php,v
retrieving revision 1.7
diff -u -p -r1.7 maintenance-page.tpl.php
--- modules/system/maintenance-page.tpl.php	28 May 2009 16:44:06 -0000	1.7
+++ modules/system/maintenance-page.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -28,46 +28,46 @@
     <div id="header">
       <div id="logo-title">
 
-        <?php if (!empty($logo)): ?>
+        <?php if (!empty($logo)) { ?>
           <a href="<?php print $base_path; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
             <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
           </a>
-        <?php endif; ?>
+        <?php }; ?>
 
         <div id="name-and-slogan">
-          <?php if (!empty($site_name)): ?>
+          <?php if (!empty($site_name)) { ?>
             <h1 id="site-name">
               <a href="<?php print $base_path ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
             </h1>
-          <?php endif; ?>
+          <?php }; ?>
 
-          <?php if (!empty($site_slogan)): ?>
+          <?php if (!empty($site_slogan)) { ?>
             <div id="site-slogan"><?php print $site_slogan; ?></div>
-          <?php endif; ?>
+          <?php }; ?>
         </div> <!-- /name-and-slogan -->
       </div> <!-- /logo-title -->
 
-      <?php if (!empty($header)): ?>
+      <?php if (!empty($header)) { ?>
         <div id="header-region">
           <?php print $header; ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
     </div> <!-- /header -->
 
     <div id="container" class="clearfix">
 
-      <?php if (!empty($left)): ?>
+      <?php if (!empty($left)) { ?>
         <div id="sidebar-left" class="column sidebar">
           <?php print $left; ?>
         </div> <!-- /sidebar-left -->
-      <?php endif; ?>
+      <?php }; ?>
 
       <div id="main" class="column"><div id="main-squeeze">
 
         <div id="content">
-          <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-          <?php if (!empty($messages)): print $messages; endif; ?>
+          <?php if (!empty($title)) { ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php }; ?>
+          <?php if (!empty($messages)) print $messages; ?>
           <div id="content-content" class="clearfix">
             <?php print $content; ?>
           </div> <!-- /content-content -->
@@ -75,17 +75,17 @@
 
       </div></div> <!-- /main-squeeze /main -->
 
-      <?php if (!empty($right)): ?>
+      <?php if (!empty($right)) { ?>
         <div id="sidebar-right" class="column sidebar">
           <?php print $right; ?>
         </div> <!-- /sidebar-right -->
-      <?php endif; ?>
+      <?php }; ?>
 
     </div> <!-- /container -->
 
     <div id="footer-wrapper">
       <div id="footer">
-        <?php if (!empty($footer)): print $footer; endif; ?>
+        <?php if (!empty($footer)) print $footer; ?>
       </div> <!-- /footer -->
     </div> <!-- /footer-wrapper -->
 
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.24
diff -u -p -r1.24 page.tpl.php
--- modules/system/page.tpl.php	4 Jul 2009 05:21:15 -0000	1.24
+++ modules/system/page.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -104,71 +104,72 @@
 </head>
 <body class="<?php print $classes; ?>">
 
-  <?php if ($page_top): ?>
+  <?php if ($page_top) { ?>
     <div id="page-top-region" class="clearfix">
       <?php print $page_top; ?>
     </div>
-  <?php endif; ?>
+  <?php }; ?>
   <div id="page-wrapper"><div id="page">
 
     <div id="header"><div class="section clearfix">
 
-      <?php if ($logo): ?>
+      <?php if ($logo) { ?>
         <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
           <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
         </a>
-      <?php endif; ?>
+      <?php }; ?>
 
-      <?php if ($site_name || $site_slogan): ?>
+      <?php if ($site_name || $site_slogan) { ?>
         <div id="name-and-slogan">
-          <?php if ($site_name): ?>
-            <?php if ($title): ?>
+          <?php if ($site_name) { ?>
+            <?php if ($title) { ?>
               <div id="site-name"><strong>
                 <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
               </strong></div>
-            <?php else: /* Use h1 when the content title is empty */ ?>
+            <?php }
+                  else { /* Use h1 when the content title is empty */ ?>
               <h1 id="site-name">
                 <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
               </h1>
-            <?php endif; ?>
-          <?php endif; ?>
+            <?php }; ?>
+          <?php }; ?>
 
-          <?php if ($site_slogan): ?>
+          <?php if ($site_slogan) { ?>
             <div id="site-slogan"><?php print $site_slogan; ?></div>
-          <?php endif; ?>
+          <?php }; ?>
         </div> <!-- /#name-and-slogan -->
-      <?php endif; ?>
+      <?php }; ?>
 
-      <?php if ($search_box): ?>
+      <?php if ($search_box) { ?>
         <div id="search-box"><?php print $search_box; ?></div>
-      <?php endif; ?>
+      <?php }; ?>
 
-      <?php if ($header): ?>
+      <?php if ($header) { ?>
         <div id="header-region" class="region">
           <?php print $header; ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
+    <?php if ($main_menu) { ?>
       <div id="navigation"><div class="section">
         <?php print theme('links', $main_menu, array('id' => 'main-menu', 'class' => 'links clearfix')); ?>
       </div></div> <!-- /.section, /#navigation -->
-    <?php endif; ?>
+    <?php }; ?>
 
-    <?php if ($breadcrumb): ?>
+    <?php if ($breadcrumb) { ?>
       <div id="breadcrumb"><?php print $breadcrumb; ?></div>
-    <?php endif; ?>
+    <?php }; ?>
 
     <?php print $messages; ?>
 
     <div id="main-wrapper"><div id="main" class="clearfix">
 
       <div id="content" class="column"><div class="section">
-        <?php if ($highlight): ?><div id="highlight"><?php print $highlight; ?></div><?php endif; ?>
-        <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
-        <?php if ($tabs): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
+        <?php if ($highlight) { ?><div id="highlight"><?php print $highlight; ?></div><?php }; ?>
+        <?php if ($title) { ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php }; ?>
+        <?php if ($tabs) { ?><div class="tabs"><?php print $tabs; ?></div><?php }; ?>
         <?php print $help; ?>
         <div id="content-area" class="region">
           <?php print $content; ?>
@@ -176,23 +177,23 @@
         <?php print $feed_icons; ?>
       </div></div> <!-- /.section, /#content -->
 
-      <?php if ($left): ?>
+      <?php if ($left) { ?>
         <div id="sidebar-left" class="column sidebar"><div class="section region">
           <?php print $left; ?>
         </div></div> <!-- /.section, /#sidebar-left -->
-      <?php endif; ?>
+      <?php }; ?>
 
-      <?php if ($right): ?>
+      <?php if ($right) { ?>
         <div id="sidebar-right" class="column sidebar"><div class="section region">
           <?php print $right; ?>
         </div></div> <!-- /.section, /#sidebar-right -->
-      <?php endif; ?>
+      <?php }; ?>
 
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
       <?php print theme('links', $secondary_menu, array('id' => 'secondary-menu', 'class' => 'links clearfix')); ?>
-      <?php if ($footer): ?><div id="footer-region" class="region"><?php print $footer; ?></div><?php endif; ?>
+      <?php if ($footer) { ?><div id="footer-region" class="region"><?php print $footer; ?></div><?php }; ?>
     </div></div> <!-- /.section, /#footer -->
 
   </div></div> <!-- /#page, /#page-wrapper -->
Index: modules/user/user-picture.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-picture.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 user-picture.tpl.php
--- modules/user/user-picture.tpl.php	24 Apr 2009 09:03:21 -0000	1.4
+++ modules/user/user-picture.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -15,8 +15,8 @@
  * @see template_preprocess_user_picture()
  */
 ?>
-<?php if ($picture): ?>
+<?php if ($picture) { ?>
   <div class="picture">
     <?php print $picture; ?>
   </div>
-<?php endif; ?>
+<?php }; ?>
Index: modules/user/user-profile-category.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-profile-category.tpl.php,v
retrieving revision 1.3
diff -u -p -r1.3 user-profile-category.tpl.php
--- modules/user/user-profile-category.tpl.php	13 Oct 2008 12:31:43 -0000	1.3
+++ modules/user/user-profile-category.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -25,9 +25,9 @@
  * @see template_preprocess_user_profile_category()
  */
 ?>
-<?php if ($title) : ?>
+<?php if ($title) { ?>
   <h3><?php print $title; ?></h3>
-<?php endif; ?>
+<?php }; ?>
 
 <dl<?php print $attributes; ?>>
   <?php print $profile_items; ?>
Index: themes/garland/block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/block.tpl.php,v
retrieving revision 1.7
diff -u -p -r1.7 block.tpl.php
--- themes/garland/block.tpl.php	12 Jun 2009 09:02:55 -0000	1.7
+++ themes/garland/block.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -3,9 +3,9 @@
 ?>
 <div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?> clearfix">
 
-<?php if (!empty($block->subject)): ?>
+<?php if (!empty($block->subject)) { ?>
   <h2><?php print $block->subject ?></h2>
-<?php endif;?>
+<?php };?>
 
   <div class="content"><?php print $content ?></div>
 </div>
Index: themes/garland/comment.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/comment.tpl.php,v
retrieving revision 1.13
diff -u -p -r1.13 comment.tpl.php
--- themes/garland/comment.tpl.php	28 May 2009 16:44:07 -0000	1.13
+++ themes/garland/comment.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -4,13 +4,13 @@
 <div class="<?php print $classes . ' ' . $zebra; ?>">
 
   <div class="clearfix">
-  <?php if ($submitted): ?>
+  <?php if ($submitted) { ?>
     <span class="submitted"><?php print $submitted; ?></span>
-  <?php endif; ?>
+  <?php }; ?>
 
-  <?php if ($comment->new) : ?>
+  <?php if ($comment->new) { ?>
     <span class="new"><?php print drupal_ucfirst($new) ?></span>
-  <?php endif; ?>
+  <?php }; ?>
 
   <?php print $picture ?>
 
@@ -18,16 +18,16 @@
 
     <div class="content">
       <?php print $content ?>
-      <?php if ($signature): ?>
+      <?php if ($signature) { ?>
       <div class="clearfix">
         <div>—</div>
         <?php print $signature ?>
       </div>
-      <?php endif; ?>
+      <?php }; ?>
     </div>
   </div>
 
-  <?php if ($links): ?>
+  <?php if ($links) { ?>
     <div class="links"><?php print $links ?></div>
-  <?php endif; ?>
+  <?php }; ?>
 </div>
Index: themes/garland/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/maintenance-page.tpl.php,v
retrieving revision 1.10
diff -u -p -r1.10 maintenance-page.tpl.php
--- themes/garland/maintenance-page.tpl.php	28 May 2009 16:44:07 -0000	1.10
+++ themes/garland/maintenance-page.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -61,15 +61,15 @@
 
       </div> <!-- /header -->
 
-      <?php if ($left): ?>
+      <?php if ($left) { ?>
         <div id="sidebar-left" class="sidebar">
-          <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
+          <?php if ($search_box) { ?><div class="block block-theme"><?php print $search_box ?></div><?php }; ?>
           <?php print $left ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
-          <?php if ($title): ?><h2><?php print $title ?></h2><?php endif; ?>
+          <?php if ($title) { ?><h2><?php print $title ?></h2><?php }; ?>
           <?php print $messages; ?>
           <?php print $help; ?>
           <div class="clearfix">
@@ -78,11 +78,11 @@
           <div id="footer"><?php print $footer ?></div>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
 
-      <?php if ($right): ?>
+      <?php if ($right) { ?>
         <div id="sidebar-right" class="sidebar">
           <?php print $right ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
     </div> <!-- /container -->
   </div>
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.11
diff -u -p -r1.11 node.tpl.php
--- themes/garland/node.tpl.php	18 Jun 2009 21:19:02 -0000	1.11
+++ themes/garland/node.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -4,13 +4,13 @@
 <div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?>">
 
 <?php print $picture ?>
-<?php if ($page == 0): ?>
+<?php if ($page == 0) { ?>
   <h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
+<?php }; ?>
 
-  <?php if ($submitted): ?>
+  <?php if ($submitted) { ?>
     <span class="submitted"><?php print $submitted; ?></span>
-  <?php endif; ?>
+  <?php }; ?>
 
   <div class="content clearfix">
     <?php hide($content['links']); hide($content['comments']); render($content); ?>
@@ -18,14 +18,14 @@
 
   <div class="clearfix">
     <div class="meta">
-    <?php if (!empty($content['links']['terms'])): ?>
+    <?php if (!empty($content['links']['terms'])) { ?>
       <div class="terms"><?php render($content['links']['terms']) ?></div>
-    <?php endif;?>
+    <?php };?>
     </div>
 
-    <?php if (!empty($content['links'])): ?>
+    <?php if (!empty($content['links'])) { ?>
       <div class="links"><?php render($content['links']) ?></div>
-    <?php endif; ?>
+    <?php }; ?>
 
     <?php render($content['comments']); ?>
 
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.28
diff -u -p -r1.28 page.tpl.php
--- themes/garland/page.tpl.php	4 Jul 2009 05:21:15 -0000	1.28
+++ themes/garland/page.tpl.php	6 Jul 2009 19:46:45 -0000
@@ -15,11 +15,11 @@
   </head>
   <body class="<?php print $classes ?>">
 
-  <?php if ($page_top): ?>
+  <?php if ($page_top) { ?>
     <div id="page-top-region" class="clearfix">
       <?php print $page_top; ?>
     </div>
-  <?php endif; ?>
+  <?php }; ?>
 
   <div id="header-region" class="clearfix"><?php print $header ?></div>
 
@@ -28,35 +28,35 @@
 
       <div id="header">
         <div id="logo-floater">
-        <?php if ($logo || $site_title): ?>
+        <?php if ($logo || $site_title) { ?>
           <h1><a href="<?php print $front_page ?>" title="<?php print $site_title ?>">
-          <?php if ($logo): ?>
+          <?php if ($logo) { ?>
             <img src="<?php print $logo ?>" alt="<?php print $site_title ?>" id="logo" />
-          <?php endif; ?>
+          <?php }; ?>
           <?php print $site_html ?>
           </a></h1>
-        <?php endif; ?>
+        <?php }; ?>
         </div>
 
-        <?php if ($primary_nav): print $primary_nav; endif; ?>
-        <?php if ($secondary_nav): print $secondary_nav; endif; ?>
+        <?php if ($primary_nav) print $primary_nav; ?>
+        <?php if ($secondary_nav) print $secondary_nav; ?>
       </div> <!-- /#header -->
 
-      <?php if ($left): ?>
+      <?php if ($left) { ?>
         <div id="sidebar-left" class="sidebar">
-          <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
+          <?php if ($search_box) { ?><div class="block block-theme"><?php print $search_box ?></div><?php }; ?>
           <?php print $left ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
           <?php print $breadcrumb; ?>
-          <?php if ($highlight): ?><div id="highlight"><?php print $highlight ?></div><?php endif; ?>
-          <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
-          <?php if ($title): ?><h2<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h2><?php endif; ?>
-          <?php if ($tabs): ?><ul class="tabs primary"><?php print $tabs ?></ul></div><?php endif; ?>
-          <?php if ($tabs2): ?><ul class="tabs secondary"><?php print $tabs2 ?></ul><?php endif; ?>
-          <?php if ($show_messages && $messages): print $messages; endif; ?>
+          <?php if ($highlight) { ?><div id="highlight"><?php print $highlight ?></div><?php }; ?>
+          <?php if ($tabs) { ?><div id="tabs-wrapper" class="clearfix"><?php }; ?>
+          <?php if ($title) { ?><h2<?php if($tabs){ print ' class="with-tabs"'; } ?>><?php print $title ?></h2><?php }; ?>
+          <?php if ($tabs) { ?><ul class="tabs primary"><?php print $tabs ?></ul></div><?php }; ?>
+          <?php if ($tabs2) { ?><ul class="tabs secondary"><?php print $tabs2 ?></ul><?php }; ?>
+          <?php if ($show_messages && $messages) print $messages; ?>
           <?php print $help; ?>
           <div class="clearfix">
             <?php print $content ?>
@@ -65,12 +65,12 @@
           <div id="footer"><?php print $footer ?></div>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
 
-      <?php if ($right): ?>
+      <?php if ($right) { ?>
         <div id="sidebar-right" class="sidebar">
-          <?php if (!$left && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
+          <?php if (!$left && $search_box) { ?><div class="block block-theme"><?php print $search_box ?></div><?php }; ?>
           <?php print $right ?>
         </div>
-      <?php endif; ?>
+      <?php }; ?>
 
     </div> <!-- /#container -->
   </div> <!-- /#wrapper -->
