Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.40
diff -u -u -p -r1.40 install.php
--- install.php	25 Mar 2007 23:34:17 -0000	1.40
+++ install.php	7 Apr 2007 19:36:46 -0000
@@ -336,7 +336,7 @@ function _install_settings_form_validate
   }
   else {
     // Verify
-    $db_url = $db_type .'://'. urlencode($db_user) .($db_pass ? ':'. urlencode($db_pass) : '') .'@'. ($db_host ? urlencode($db_host) : 'localhost'). ($db_port ? ":$db_port" : '') .'/'. urlencode($db_path);
+    $db_url = $db_type .'://'. urlencode($db_user) . ($db_pass ? ':'. urlencode($db_pass) : '') .'@'. ($db_host ? urlencode($db_host) : 'localhost') . ($db_port ? ":$db_port" : '') .'/'. urlencode($db_path);
     if (isset($form)) {
       form_set_value($form['_db_url'], $db_url);
     }
@@ -465,7 +465,8 @@ function install_select_locale($profilen
   // Don't need to choose locale if only one (English) is available.
   if (sizeof($locales) == 1) {
     return FALSE;
-  } else {
+  }
+  else {
     foreach ($locales as $locale) {
       if ($_POST['locale'] == $locale->name) {
         return $locale->name;
@@ -576,7 +577,7 @@ function install_complete($profile) {
   }
   else {
     // No more steps
-    $output .= '<p>' . (drupal_set_message() ? st('Please review the messages above before continuing on to <a href="@url">your new site</a>.', array('@url' => url(''))) : st('You may now visit <a href="@url">your new site</a>.', array('@url' => url('')))) . '</p>';
+    $output .= '<p>'. (drupal_set_message() ? st('Please review the messages above before continuing on to <a href="@url">your new site</a>.', array('@url' => url(''))) : st('You may now visit <a href="@url">your new site</a>.', array('@url' => url('')))) .'</p>';
   }
   // Output page.
   print theme('maintenance_page', $output);
Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.215
diff -u -u -p -r1.215 update.php
--- update.php	2 Apr 2007 15:15:50 -0000	1.215
+++ update.php	7 Apr 2007 19:36:47 -0000
@@ -358,7 +358,7 @@ function update_script_selection_form() 
 
       $form['start'][$module] = array(
         '#type' => 'select',
-        '#title' => $module . ' module',
+        '#title' => $module .' module',
         '#default_value' => $default,
         '#options' => $updates,
       );
Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.153
diff -u -u -p -r1.153 bootstrap.inc
--- includes/bootstrap.inc	6 Apr 2007 13:27:20 -0000	1.153
+++ includes/bootstrap.inc	7 Apr 2007 19:36:47 -0000
@@ -272,7 +272,7 @@ function conf_init() {
     if (!isset($parts['path'])) {
       $parts['path'] = '';
     }
-    $base_path = $parts['path'] . '/';
+    $base_path = $parts['path'] .'/';
     // Build $base_root (everything until first slash after "scheme://").
     $base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path']));
   }
@@ -518,7 +518,7 @@ function drupal_load($type, $name) {
  */
 function drupal_page_header() {
   header("Expires: Sun, 19 Nov 1978 05:00:00 GMT");
-  header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+  header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
   header("Cache-Control: store, no-cache, must-revalidate");
   header("Cache-Control: post-check=0, pre-check=0", FALSE);
 }
@@ -535,7 +535,7 @@ function drupal_page_header() {
 function drupal_page_cache_header($cache) {
   // Set default values:
   $last_modified = gmdate('D, d M Y H:i:s', $cache->created) .' GMT';
-  $etag = '"'.md5($last_modified).'"';
+  $etag = '"'. md5($last_modified) .'"';
 
   // See if the client has provided the required HTTP headers:
   $if_modified_since = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']) : FALSE;
@@ -841,7 +841,7 @@ function _drupal_bootstrap($phase) {
       // Deny access to hosts which were banned - t() is not yet available.
       if (drupal_is_denied('host', $_SERVER['REMOTE_ADDR'])) {
         header('HTTP/1.1 403 Forbidden');
-        print 'Sorry, '. $_SERVER['REMOTE_ADDR']. ' has been banned.';
+        print 'Sorry, '. $_SERVER['REMOTE_ADDR'] .' has been banned.';
         exit();
       }
       break;
@@ -934,7 +934,7 @@ function drupal_maintenance_theme() {
   $themes = drupal_common_themes();
   foreach ($themes as $hook => $info) {
     if (!isset($info['file']) && !isset($info['function'])) {
-      $themes[$hook]['function'] = 'theme_' . $hook;
+      $themes[$hook]['function'] = 'theme_'. $hook;
     }
   }
   _theme_set_registry($themes);
@@ -994,7 +994,7 @@ function language_list($field = 'languag
   // Return the array indexed by the right field
   if (!isset($languages[$field])) {
     $languages[$field] = array();
-    foreach($languages['language'] as $lang) {
+    foreach ($languages['language'] as $lang) {
       // Some values should be collected into an array
       if (in_array($field, array('enabled', 'weight'))) {
         $languages[$field][$lang->$field][$lang->language] = $lang;
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.627
diff -u -u -p -r1.627 common.inc
--- includes/common.inc	6 Apr 2007 13:27:20 -0000	1.627
+++ includes/common.inc	7 Apr 2007 19:36:47 -0000
@@ -544,7 +544,7 @@ function drupal_error_handler($errno, $m
     return;
   }
 
-  if ($errno & (E_ALL)) {
+  if ($errno & (E_ALL ^ E_NOTICE)) {
     $types = array(1 => 'error', 2 => 'warning', 4 => 'parse error', 8 => 'notice', 16 => 'core error', 32 => 'core warning', 64 => 'compile error', 128 => 'compile warning', 256 => 'user error', 512 => 'user warning', 1024 => 'user notice', 2048 => 'strict warning');
     $entry = $types[$errno] .': '. $message .' in '. $filename .' on line '. $line .'.';
 
@@ -1199,7 +1199,7 @@ function url($path = NULL, $options = ar
     $clean_url = (bool)variable_get('clean_url', '0');
   }
 
-  $base = $options['absolute'] ? $base_url . '/' : base_path();
+  $base = $options['absolute'] ? $base_url .'/' : base_path();
 
   // The special path '<front>' links to the default front page.
   if (!empty($path) && $path != '<front>') {
Index: includes/database.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.inc,v
retrieving revision 1.66
diff -u -u -p -r1.66 database.inc
--- includes/database.inc	6 Apr 2007 04:39:50 -0000	1.66
+++ includes/database.inc	7 Apr 2007 19:36:47 -0000
@@ -64,13 +64,13 @@ function db_prefix_tables($sql) {
       $tmp = $db_prefix;
       unset($tmp['default']);
       foreach ($tmp as $key => $val) {
-        $sql = strtr($sql, array('{'. $key. '}' => $val. $key));
+        $sql = strtr($sql, array('{'. $key .'}' => $val . $key));
       }
       return strtr($sql, array('{' => $db_prefix['default'], '}' => ''));
     }
     else {
       foreach ($db_prefix as $key => $val) {
-        $sql = strtr($sql, array('{'. $key. '}' => $val. $key));
+        $sql = strtr($sql, array('{'. $key .'}' => $val . $key));
       }
       return strtr($sql, array('{' => '', '}' => ''));
     }
Index: includes/database.mysql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysql.inc,v
retrieving revision 1.68
diff -u -u -p -r1.68 database.mysql.inc
--- includes/database.mysql.inc	19 Mar 2007 01:17:37 -0000	1.68
+++ includes/database.mysql.inc	7 Apr 2007 19:36:48 -0000
@@ -72,7 +72,7 @@ function db_connect($url) {
   // Decode url-encoded information in the db connection string
   $url['user'] = urldecode($url['user']);
   // Test if database url has a password.
-  if(isset($url['pass'])) {
+  if (isset($url['pass'])) {
     $url['pass'] = urldecode($url['pass']);
   }
   else {
@@ -154,7 +154,7 @@ function _db_query($query, $debug = 0) {
 
   if (variable_get('dev_query', 0)) {
     $bt = debug_backtrace();
-    $query = $bt[2]['function'] . "\n" . $query;
+    $query = $bt[2]['function'] ."\n". $query;
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;
@@ -377,7 +377,7 @@ function db_query_temporary($query) {
  */
 function db_encode_blob($data) {
   global $active_db;
-  return "'" . mysql_real_escape_string($data, $active_db) . "'";
+  return "'". mysql_real_escape_string($data, $active_db) ."'";
 }
 
 /**
@@ -418,7 +418,7 @@ function db_unlock_tables() {
  * Check if a table exists.
  */
 function db_table_exists($table) {
-  return db_num_rows(db_query("SHOW TABLES LIKE '{" . db_escape_table($table) . "}'"));
+  return db_num_rows(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'"));
 }
 
 /**
Index: includes/database.mysqli.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.mysqli.inc,v
retrieving revision 1.33
diff -u -u -p -r1.33 database.mysqli.inc
--- includes/database.mysqli.inc	19 Mar 2007 01:17:37 -0000	1.33
+++ includes/database.mysqli.inc	7 Apr 2007 19:36:48 -0000
@@ -67,7 +67,7 @@ function db_connect($url) {
   // Decode url-encoded information in the db connection string
   $url['user'] = urldecode($url['user']);
   // Test if database url has a password.
-  if(isset($url['pass'])) {
+  if (isset($url['pass'])) {
     $url['pass'] = urldecode($url['pass']);
   }
   else {
@@ -133,7 +133,7 @@ function _db_query($query, $debug = 0) {
 
   if (variable_get('dev_query', 0)) {
     $bt = debug_backtrace();
-    $query = $bt[2]['function'] . "\n" . $query;
+    $query = $bt[2]['function'] ."\n". $query;
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;
@@ -357,7 +357,7 @@ function db_query_temporary($query) {
  */
 function db_encode_blob($data) {
   global $active_db;
-  return "'" . mysqli_real_escape_string($active_db, $data) . "'";
+  return "'". mysqli_real_escape_string($active_db, $data) ."'";
 }
 
 /**
@@ -398,7 +398,7 @@ function db_unlock_tables() {
  * Check if a table exists.
  */
 function db_table_exists($table) {
-  return db_num_rows(db_query("SHOW TABLES LIKE '{" . db_escape_table($table) . "}'"));
+  return db_num_rows(db_query("SHOW TABLES LIKE '{". db_escape_table($table) ."}'"));
 }
 
 /**
Index: includes/database.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/database.pgsql.inc,v
retrieving revision 1.43
diff -u -u -p -r1.43 database.pgsql.inc
--- includes/database.pgsql.inc	27 Dec 2006 22:13:56 -0000	1.43
+++ includes/database.pgsql.inc	7 Apr 2007 19:36:48 -0000
@@ -65,19 +65,19 @@ function db_connect($url) {
 
   // Decode url-encoded information in the db connection string
   if (isset($url['user'])) {
-    $conn_string .= ' user=' . urldecode($url['user']);
+    $conn_string .= ' user='. urldecode($url['user']);
   }
   if (isset($url['pass'])) {
-    $conn_string .= ' password=' . urldecode($url['pass']);
+    $conn_string .= ' password='. urldecode($url['pass']);
   }
   if (isset($url['host'])) {
-    $conn_string .= ' host=' . urldecode($url['host']);
+    $conn_string .= ' host='. urldecode($url['host']);
   }
   if (isset($url['path'])) {
-    $conn_string .= ' dbname=' . substr(urldecode($url['path']), 1);
+    $conn_string .= ' dbname='. substr(urldecode($url['path']), 1);
   }
   if (isset($url['port'])) {
-    $conn_string .= ' port=' . urldecode($url['port']);
+    $conn_string .= ' port='. urldecode($url['port']);
   }
 
   // pg_last_error() does not return a useful error message for database
@@ -126,7 +126,7 @@ function _db_query($query, $debug = 0) {
 
   if (variable_get('dev_query', 0)) {
     $bt = debug_backtrace();
-    $query = $bt[2]['function'] . "\n" . $query;
+    $query = $bt[2]['function'] ."\n". $query;
     list($usec, $sec) = explode(' ', microtime());
     $stop = (float)$usec + (float)$sec;
     $diff = $stop - $timer;
@@ -391,7 +391,7 @@ function db_unlock_tables() {
  * Check if a table exists.
  */
 function db_table_exists($table) {
-  return db_num_rows(db_query("SELECT relname FROM pg_class WHERE relname = '{" . db_escape_table($table) . "}'"));
+  return db_num_rows(db_query("SELECT relname FROM pg_class WHERE relname = '{". db_escape_table($table) ."}'"));
 }
 
 /**
@@ -421,7 +421,7 @@ function db_distinct_field($table, $fiel
   $field_to_select = 'DISTINCT ON ('. $table .'.'. $field .") $table.$field";
   // (?<!text) is a negative look-behind (no need to rewrite queries that already use DISTINCT).
   $query = preg_replace('/(SELECT.*)(?:'. $table .'\.|\s)(?<!DISTINCT\()(?<!DISTINCT\('. $table .'\.)'. $field .'(.*FROM )/AUsi', '\1 '. $field_to_select .'\2', $query);
-  $query = preg_replace('/(ORDER BY )(?!'.$table.'\.'.$field.')/', '\1'."$table.$field, ", $query);
+  $query = preg_replace('/(ORDER BY )(?!'. $table .'\.'. $field .')/', '\1'."$table.$field, ", $query);
   return $query;
 }
 
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.95
diff -u -u -p -r1.95 file.inc
--- includes/file.inc	27 Mar 2007 05:13:53 -0000	1.95
+++ includes/file.inc	7 Apr 2007 19:36:49 -0000
@@ -28,7 +28,7 @@ define('FILE_EXISTS_ERROR', 2);
  */
 function file_create_url($path) {
   // Strip file_directory_path from $path. We only include relative paths in urls.
-  if (strpos($path, file_directory_path() . '/') === 0) {
+  if (strpos($path, file_directory_path() .'/') === 0) {
     $path = trim(substr($path, strlen(file_directory_path())), '\\/');
   }
   switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) {
@@ -63,8 +63,8 @@ function file_create_path($dest = 0) {
     return $dest;
   }
   // Not found, try again with prefixed directory path.
-  else if (file_check_location($file_path . '/' . $dest, $file_path)) {
-    return $file_path . '/' . $dest;
+  else if (file_check_location($file_path .'/'. $dest, $file_path)) {
+    return $file_path .'/'. $dest;
   }
   // File not found.
   return FALSE;
@@ -215,7 +215,7 @@ function file_check_upload($source = 'up
 
       // Unknown error
       default:
-        drupal_set_message(t('The file %file could not be saved. An unknown error has occurred.', array('%file' => $source)),'error');
+        drupal_set_message(t('The file %file could not be saved. An unknown error has occurred.', array('%file' => $source)), 'error');
         return 0;
     }
 
@@ -699,7 +699,7 @@ function file_directory_temp() {
     }
 
     // if a directory has been found, use it, otherwise default to 'files/tmp' or 'files\\tmp';
-    $temporary_directory = $temporary_directory ? $temporary_directory : file_directory_path() . $path_delimiter . 'tmp';
+    $temporary_directory = $temporary_directory ? $temporary_directory : file_directory_path() . $path_delimiter .'tmp';
     variable_set('file_directory_temp', $temporary_directory);
   }
 
Index: includes/form.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/form.inc,v
retrieving revision 1.186
diff -u -u -p -r1.186 form.inc
--- includes/form.inc	6 Apr 2007 13:27:20 -0000	1.186
+++ includes/form.inc	7 Apr 2007 19:36:49 -0000
@@ -728,7 +728,7 @@ function form_builder($form_id, $form) {
         }
       }
       if (!isset($form['#value'])) {
-        $function = $form['#type'] . '_value';
+        $function = $form['#type'] .'_value';
         if (function_exists($function)) {
           $function($form);
         }
@@ -928,7 +928,7 @@ function form_options_flatten($array, $r
  */
 function theme_select($element) {
   $select = '';
-  $size = $element['#size'] ? ' size="' . $element['#size'] . '"' : '';
+  $size = $element['#size'] ? ' size="'. $element['#size'] .'"' : '';
   _form_set_class($element, array('form-select'));
   $multiple = $element['#multiple'];
   return theme('form_element', $element, '<select name="'. $element['#name'] .''. ($multiple ? '[]' : '') .'"'. ($multiple ? ' multiple="multiple" ' : '') . drupal_attributes($element['#attributes']) .' id="'. $element['#id'] .'" '. $size .'>'. form_select_options($element) .'</select>');
@@ -1039,7 +1039,7 @@ function theme_fieldset($element) {
     }
   }
 
-  return '<fieldset' . drupal_attributes($element['#attributes']) .'>' . ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . $element['#value'] . "</fieldset>\n";
+  return '<fieldset'. drupal_attributes($element['#attributes']) .'>'. ($element['#title'] ? '<legend>'. $element['#title'] .'</legend>' : '') . (isset($element['#description']) && $element['#description'] ? '<div class="description">'. $element['#description'] .'</div>' : '') . (!empty($element['#children']) ? $element['#children'] : '') . $element['#value'] ."</fieldset>\n";
 }
 
 /**
@@ -1054,7 +1054,7 @@ function theme_fieldset($element) {
 function theme_radio($element) {
   _form_set_class($element, array('form-radio'));
   $output = '<input type="radio" ';
-  $output .= 'name="' . $element['#name'] .'" ';
+  $output .= 'name="'. $element['#name'] .'" ';
   $output .= 'value="'. $element['#return_value'] .'" ';
   $output .= ($element['#value'] == $element['#return_value']) ? ' checked="checked" ' : ' ';
   $output .= drupal_attributes($element['#attributes']) .' />';
@@ -1306,10 +1306,10 @@ function theme_checkbox($element) {
   $checkbox = '<input ';
   $checkbox .= 'type="checkbox" ';
   $checkbox .= 'name="'. $element['#name'] .'" ';
-  $checkbox .= 'id="'. $element['#id'].'" ' ;
+  $checkbox .= 'id="'. $element['#id'] .'" ' ;
   $checkbox .= 'value="'. $element['#return_value'] .'" ';
   $checkbox .= $element['#value'] ? ' checked="checked" ' : ' ';
-  $checkbox .= drupal_attributes($element['#attributes']) . ' />';
+  $checkbox .= drupal_attributes($element['#attributes']) .' />';
 
   if (!is_null($element['#title'])) {
     $checkbox = '<label class="option">'. $checkbox .' '. $element['#title'] .'</label>';
@@ -1371,7 +1371,7 @@ function theme_button($element) {
     $element['#attributes']['class'] = 'form-'. $element['#button_type'];
   }
 
-  return '<input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ')  .'id="'. $element['#id'].'" value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
+  return '<input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ') .'id="'. $element['#id'] .'" value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
 }
 
 /**
@@ -1384,7 +1384,7 @@ function theme_button($element) {
  *   A themed HTML string representing the hidden form field.
  */
 function theme_hidden($element) {
-  return '<input type="hidden" name="'. $element['#name'] . '" id="'. $element['#id'] . '" value="'. check_plain($element['#value']) ."\" " . drupal_attributes($element['#attributes']) ." />\n";
+  return '<input type="hidden" name="'. $element['#name'] .'" id="'. $element['#id'] .'" value="'. check_plain($element['#value']) ."\" ". drupal_attributes($element['#attributes']) ." />\n";
 }
 
 function theme_token($element) {
@@ -1401,7 +1401,7 @@ function theme_token($element) {
  *   A themed HTML string representing the textfield.
  */
 function theme_textfield($element) {
-  $size = $element['#size'] ? ' size="' . $element['#size'] . '"' : '';
+  $size = $element['#size'] ? ' size="'. $element['#size'] .'"' : '';
   $class = array('form-text');
   $extra = '';
   $output = '';
@@ -1423,7 +1423,7 @@ function theme_textfield($element) {
     $output .= ' <span class="field-suffix">'. $element['#field_suffix'] .'</span>';
   }
 
-  return theme('form_element', $element, $output). $extra;
+  return theme('form_element', $element, $output) . $extra;
 }
 
 /**
@@ -1437,8 +1437,8 @@ function theme_textfield($element) {
  */
 function theme_form($element) {
   // Anonymous div to satisfy XHTML compliance.
-  $action = $element['#action'] ? 'action="' . check_url($element['#action']) . '" ' : '';
-  return '<form '. $action . ' method="'. $element['#method'] .'" '. 'id="'. $element['#id'] .'"'. drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
+  $action = $element['#action'] ? 'action="'. check_url($element['#action']) .'" ' : '';
+  return '<form '. $action .' method="'. $element['#method'] .'" id="'. $element['#id'] .'"'. drupal_attributes($element['#attributes']) .">\n<div>". $element['#children'] ."\n</div></form>\n";
 }
 
 /**
@@ -1588,7 +1588,7 @@ function _form_set_class(&$element, $cla
   if ($element['#required']) {
     $class[] = 'required';
   }
-  if (form_get_error($element)){
+  if (form_get_error($element)) {
     $class[] = 'error';
   }
   if (isset($element['#attributes']['class'])) {
Index: includes/image.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/image.inc,v
retrieving revision 1.17
diff -u -u -p -r1.17 image.inc
--- includes/image.inc	26 Dec 2006 14:01:41 -0000	1.17
+++ includes/image.inc	7 Apr 2007 19:36:49 -0000
@@ -31,7 +31,7 @@ function image_get_toolkit() {
   static $toolkit;
   if (!$toolkit) {
     $toolkit = variable_get('image_toolkit', 'gd');
-   $toolkit_file = './includes/image.'.$toolkit.'.inc';
+    $toolkit_file = './includes/image.'. $toolkit .'.inc';
     if ($toolkit != 'gd' && file_exists($toolkit_file)) {
       include_once $toolkit_file;
     }
Index: includes/install.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.inc,v
retrieving revision 1.35
diff -u -u -p -r1.35 install.inc
--- includes/install.inc	27 Mar 2007 05:13:53 -0000	1.35
+++ includes/install.inc	7 Apr 2007 19:36:49 -0000
@@ -307,11 +307,11 @@ function drupal_install_profile($profile
   $module_list = array_diff($module_list, array('system'));
 
   $system_path = dirname(drupal_get_filename('module', 'system', NULL));
-  require_once './' . $system_path . '/system.install';
+  require_once './'. $system_path .'/system.install';
   module_invoke('system', 'install');
   $system_versions = drupal_get_schema_versions('system');
   $system_version = $system_versions ? max($system_versions) : SCHEMA_INSTALLED;
-  db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES('%s', '%s', 'module', '', 1, 0, 0, %d)", $system_path . '/system.module', 'system', $system_version);
+  db_query("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap, schema_version) VALUES('%s', '%s', 'module', '', 1, 0, 0, %d)", $system_path .'/system.module', 'system', $system_version);
 
   // Now that we've installed things properly, bootstrap the full Drupal environment
   drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
@@ -564,7 +564,7 @@ function drupal_install_fix_file($file, 
  */
 function install_goto($path) {
   global $base_url;
-  header('Location: '. $base_url . '/' . $path);
+  header('Location: '. $base_url .'/'. $path);
   exit();
 }
 
@@ -578,7 +578,7 @@ function st($string, $args = array()) {
 
   if (!isset($locale_strings)) {
     $locale_strings = array();
-    $filename = './profiles/' . $profile . '/' . $install_locale . '.po';
+    $filename = './profiles/'. $profile .'/'. $install_locale .'.po';
     if (file_exists($filename)) {
       require_once './includes/locale.inc';
       $file = (object) array('filepath' => $filename);
Index: includes/install.pgsql.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/install.pgsql.inc,v
retrieving revision 1.2
diff -u -u -p -r1.2 install.pgsql.inc
--- includes/install.pgsql.inc	27 Dec 2006 13:02:34 -0000	1.2
+++ includes/install.pgsql.inc	7 Apr 2007 19:36:49 -0000
@@ -34,8 +34,8 @@ function drupal_test_pgsql($url, &$succe
   $url['path'] = urldecode($url['path']);
 
   // Build pgsql connection string and allow for non-standard PostgreSQL port.
-  $conn_string = ' user='. $url['user'] .' dbname='. substr($url['path'], 1) .' password='. $url['pass'] . ' host=' . $url['host'];
-  $conn_string .= isset($url['port']) ? ' port=' . $url['port'] : '';
+  $conn_string = ' user='. $url['user'] .' dbname='. substr($url['path'], 1) .' password='. $url['pass'] .' host='. $url['host'];
+  $conn_string .= isset($url['port']) ? ' port='. $url['port'] : '';
 
   // Test connecting to the database.
   $connection = @pg_connect($conn_string);
Index: includes/language.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/language.inc,v
retrieving revision 1.2
diff -u -u -p -r1.2 language.inc
--- includes/language.inc	28 Mar 2007 14:08:21 -0000	1.2
+++ includes/language.inc	7 Apr 2007 19:36:49 -0000
@@ -13,13 +13,13 @@ function language_initialize() {
   global $user;
 
   $mode = variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE);
-  switch($mode) {
+  switch ($mode) {
     case LANGUAGE_NEGOTIATION_NONE:
       return language_default();
 
     case LANGUAGE_NEGOTIATION_DOMAIN:
       $languages = language_list();
-      foreach($languages as $language) {
+      foreach ($languages as $language) {
         $parts = parse_url($language->domain);
         if ($_SERVER['SERVER_NAME'] == $parts['host']) {
           return $language;
@@ -101,7 +101,7 @@ function language_url_rewrite(&$path, &$
 
     // Language can be passed as an option, or we go for current language.
     $path_language = isset($options['language']) ? $options['language'] : $language;
-    switch(variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) {
+    switch (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) {
 
       case LANGUAGE_NEGOTIATION_NONE:
         break;
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.114
diff -u -u -p -r1.114 locale.inc
--- includes/locale.inc	6 Apr 2007 14:15:43 -0000	1.114
+++ includes/locale.inc	7 Apr 2007 19:36:52 -0000
@@ -98,7 +98,7 @@ function theme_locale_admin_manage_scree
   foreach ($form['name'] as $key => $element) {
     // Do not take form control structures.
     if (is_array($element) && element_child($key)) {
-      $rows[] = array(array('data' => drupal_render($form['enabled'][$key]), 'align' => 'center'), check_plain($key), '<strong>'. drupal_render($form['name'][$key]) .'</strong>', drupal_render($form['native'][$key]), drupal_render($form['direction'][$key]), drupal_render($form['site_default'][$key]), drupal_render($form['weight'][$key]), l(t('edit'), 'admin/build/locale/language/edit/'. $key). ($key != 'en' ? ' ' .l(t('delete'), 'admin/build/locale/language/delete/'. $key) : ''));
+      $rows[] = array(array('data' => drupal_render($form['enabled'][$key]), 'align' => 'center'), check_plain($key), '<strong>'. drupal_render($form['name'][$key]) .'</strong>', drupal_render($form['native'][$key]), drupal_render($form['direction'][$key]), drupal_render($form['site_default'][$key]), drupal_render($form['weight'][$key]), l(t('edit'), 'admin/build/locale/language/edit/'. $key) . ($key != 'en' ? ' '. l(t('delete'), 'admin/build/locale/language/delete/'. $key) : ''));
     }
   }
   $header = array(array('data' => t('Enabled')), array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Native name')), array('data' => t('Direction')), array('data' => t('Default')), array('data' => t('Weight')), array('data' => t('Operations')));
@@ -350,7 +350,7 @@ function locale_edit_language_form_submi
   $default = language_default();
   if ($default->language == $form_values['langcode']) {
     $properties = array('name', 'native', 'direction', 'enabled', 'plurals', 'formula', 'domain', 'prefix', 'weight');
-    foreach($properties as $keyname) {
+    foreach ($properties as $keyname) {
       $default->$keyname = $form_values[$keyname];
     }
     variable_set('language_default', $default);
@@ -594,7 +594,7 @@ function _locale_string_edit($lid) {
   }
 
   // Handle erroneous lid.
-  if (!isset($orig)){
+  if (!isset($orig)) {
     drupal_set_message(t('String not found.'));
     drupal_goto('admin/build/locale/string/search');
   }
@@ -1408,8 +1408,8 @@ function _locale_export_po($language = N
           }
         }
         else {
-          print 'msgstr[0] ""'. "\n";
-          print 'msgstr[1] ""'. "\n";
+          print 'msgstr[0] ""'."\n";
+          print 'msgstr[1] ""'."\n";
         }
       }
       else {
@@ -1417,7 +1417,7 @@ function _locale_export_po($language = N
           print 'msgstr '. _locale_export_print($message['translation']);
         }
         else {
-          print 'msgstr ""'. "\n";
+          print 'msgstr ""'."\n";
         }
       }
       print "\n";
@@ -1478,7 +1478,7 @@ function _locale_export_wrap($str, $len)
       $nstr = 0;
     }
     elseif (strlen("$cur $word") > $len) {
-      $ret[] = $cur . " ";
+      $ret[] = $cur ." ";
       $cur = $word;
     }
     else {
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.160
diff -u -u -p -r1.160 menu.inc
--- includes/menu.inc	6 Apr 2007 04:39:50 -0000	1.160
+++ includes/menu.inc	7 Apr 2007 19:36:56 -0000
@@ -533,11 +533,11 @@ function theme_menu_tree($tree) {
  * Generate the HTML output for a menu item and submenu.
  */
 function theme_menu_item($link, $has_children, $menu = '') {
-  return '<li class="'. ($menu ? 'expanded' : ($has_children ? 'collapsed' : 'leaf')) .'">'. $link . $menu .'</li>' . "\n";
+  return '<li class="'. ($menu ? 'expanded' : ($has_children ? 'collapsed' : 'leaf')) .'">'. $link . $menu .'</li>'."\n";
 }
 
 function theme_menu_local_task($link, $active = FALSE) {
-  return '<li '. ($active ? 'class="active" ' : ''). '>'. $link .'</li>';
+  return '<li '. ($active ? 'class="active" ' : '') .'>'. $link .'</li>';
 }
 
 /**
@@ -603,7 +603,7 @@ function menu_rebuild() {
         }
         else {
           if (function_exists($matches[1] .'_to_arg')) {
-            $to_arg_functions[$k] = $matches[1].'_to_arg';
+            $to_arg_functions[$k] = $matches[1] .'_to_arg';
             $load_functions[$k] = NULL;
             $match = TRUE;
           }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.346
diff -u -u -p -r1.346 theme.inc
--- includes/theme.inc	6 Apr 2007 14:31:51 -0000	1.346
+++ includes/theme.inc	7 Apr 2007 19:36:56 -0000
@@ -71,12 +71,12 @@ function init_theme() {
 
   if (strpos($themes[$theme]->filename, '.theme')) {
    // file is a theme; include it
-   include_once './' . $themes[$theme]->filename;
+   include_once './'. $themes[$theme]->filename;
    _theme_load_registry($theme);
   }
   elseif (strpos($themes[$theme]->description, '.engine')) {
     // file is a template; include its engine
-    include_once './' . $themes[$theme]->description;
+    include_once './'. $themes[$theme]->description;
     $theme_engine = basename($themes[$theme]->description, '.engine');
     if (function_exists($theme_engine .'_init')) {
       call_user_func($theme_engine .'_init', $themes[$theme]);
@@ -483,7 +483,7 @@ function theme_get_settings($key = NULL)
 
   if (module_exists('node')) {
     foreach (node_get_types() as $type => $name) {
-      $defaults['toggle_node_info_' . $type] = 1;
+      $defaults['toggle_node_info_'. $type] = 1;
     }
   }
   $settings = array_merge($defaults, variable_get('theme_settings', array()));
@@ -549,7 +549,7 @@ function theme_get_setting($setting_name
           $settings['favicon'] = base_path() . $favicon;
         }
         else {
-          $settings['favicon'] = base_path() . 'misc/favicon.ico';
+          $settings['favicon'] = base_path() .'misc/favicon.ico';
         }
       }
       elseif ($settings['favicon_path']) {
@@ -680,7 +680,7 @@ function theme_page($content) {
   $output .= '</td><td style="vertical-align: top;">';
 
   $output .= theme('breadcrumb', drupal_get_breadcrumb());
-  $output .= '<h1>' . drupal_get_title() . '</h1>';
+  $output .= '<h1>'. drupal_get_title() .'</h1>';
 
   if ($tabs = theme('menu_local_tasks')) {
    $output .= $tabs;
@@ -864,7 +864,7 @@ function theme_links($links, $attributes
 
       // Automatically add a class to each link and also to each LI
       if (isset($link['attributes']) && isset($link['attributes']['class'])) {
-        $link['attributes']['class'] .= ' ' . $key;
+        $link['attributes']['class'] .= ' '. $key;
         $class = $key;
       }
       else {
@@ -1153,7 +1153,7 @@ function theme_table_select_header_cell(
  *   A themed sort icon.
  */
 function theme_tablesort_indicator($style) {
-  if ($style == "asc"){
+  if ($style == "asc") {
     return theme('image', 'misc/arrow-asc.png', t('sort icon'), t('sort ascending'));
   }
   else {
@@ -1248,7 +1248,7 @@ function theme_item_list($items = array(
   }
 
   if (!empty($items)) {
-    $output .= "<$type" . drupal_attributes($attributes) . '>';
+    $output .= "<$type". drupal_attributes($attributes) .'>';
     foreach ($items as $item) {
       $attributes = array();
       $children = array();
@@ -1271,7 +1271,7 @@ function theme_item_list($items = array(
       if (count($children) > 0) {
         $data .= theme_item_list($children, NULL, $type, $attributes); // Render nested list
       }
-      $output .= '<li' . drupal_attributes($attributes) . '>'. $data .'</li>';
+      $output .= '<li'. drupal_attributes($attributes) .'>'. $data .'</li>';
     }
     $output .= "</$type>";
   }
@@ -1283,7 +1283,7 @@ function theme_item_list($items = array(
  * Returns code that emits the 'more help'-link.
  */
 function theme_more_help_link($url) {
-  return '<div class="more-help-link">' . t('[<a href="@link">more help...</a>]', array('@link' => check_url($url))) . '</div>';
+  return '<div class="more-help-link">'. t('[<a href="@link">more help...</a>]', array('@link' => check_url($url))) .'</div>';
 }
 
 /**
@@ -1291,7 +1291,7 @@ function theme_more_help_link($url) {
  */
 function theme_xml_icon($url) {
   if ($image = theme('image', 'misc/xml.png', t('XML feed'), t('XML feed'))) {
-    return '<a href="'. check_url($url) .'" class="xml-icon">'. $image. '</a>';
+    return '<a href="'. check_url($url) .'" class="xml-icon">'. $image .'</a>';
   }
 }
 
@@ -1300,7 +1300,7 @@ function theme_xml_icon($url) {
  */
 function theme_feed_icon($url) {
   if ($image = theme('image', 'misc/feed.png', t('Syndicate content'), t('Syndicate content'))) {
-    return '<a href="'. check_url($url) .'" class="feed-icon">'. $image. '</a>';
+    return '<a href="'. check_url($url) .'" class="feed-icon">'. $image .'</a>';
   }
 }
 
Index: includes/xmlrpc.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/xmlrpc.inc,v
retrieving revision 1.38
diff -u -u -p -r1.38 xmlrpc.inc
--- includes/xmlrpc.inc	3 Sep 2006 08:21:18 -0000	1.38
+++ includes/xmlrpc.inc	7 Apr 2007 19:36:56 -0000
@@ -114,7 +114,7 @@ function xmlrpc_value_get_xml($xmlrpc_va
       $return = '<struct>'."\n";
       foreach ($xmlrpc_value->data as $name => $value) {
         $return .= "  <member><name>". check_plain($name) ."</name><value>";
-        $return .= xmlrpc_value_get_xml($value)."</value></member>\n";
+        $return .= xmlrpc_value_get_xml($value) ."</value></member>\n";
       }
       $return .= '</struct>';
       return $return;
@@ -207,7 +207,7 @@ function xmlrpc_message_tag_open($parser
   $xmlrpc_message = xmlrpc_message_get();
   $xmlrpc_message->current_tag_contents = '';
   $xmlrpc_message->last_open = $tag;
-  switch($tag) {
+  switch ($tag) {
     case 'methodCall':
     case 'methodResponse':
     case 'fault':
@@ -235,7 +235,7 @@ function xmlrpc_message_cdata($parser, $
 function xmlrpc_message_tag_close($parser, $tag) {
   $xmlrpc_message = xmlrpc_message_get();
   $value_flag = FALSE;
-  switch($tag) {
+  switch ($tag) {
     case 'int':
     case 'i4':
       $value = (int)trim($xmlrpc_message->current_tag_contents);
@@ -355,7 +355,7 @@ function xmlrpc_error($code = NULL, $mes
 }
 
 function xmlrpc_error_get_xml($xmlrpc_error) {
-    return <<<EOD
+  return <<<EOD
 <methodResponse>
   <fault>
   <value>
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.335
diff -u -u -p -r1.335 aggregator.module
--- modules/aggregator/aggregator.module	7 Apr 2007 07:38:36 -0000	1.335
+++ modules/aggregator/aggregator.module	7 Apr 2007 19:36:57 -0000
@@ -1048,7 +1048,7 @@ function aggregator_admin_overview() {
  * Menu callback; displays the most recent items gathered from any feed.
  */
 function aggregator_page_last() {
-  drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'Drupal') . ' ' . t('aggregator'));
+  drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'Drupal') .' '. t('aggregator'));
 
   return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1));
 }
@@ -1070,7 +1070,7 @@ function aggregator_page_source() {
 function aggregator_page_category() {
   $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
 
-  drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'Drupal') . ' ' . t('aggregator - @title', array('@title' => $category->title)));
+  drupal_add_feed(url('aggregator/rss/'. arg(2)), variable_get('site_name', 'Drupal') .' '. t('aggregator - @title', array('@title' => $category->title)));
 
   return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3));
 }
@@ -1213,8 +1213,8 @@ function aggregator_page_rss() {
   $result = NULL;
   if (arg(2)) {
     $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
-    $url = '/categories/' . $category->cid;
-    $title = ' ' . t('in category') . ' ' . $category->title;
+    $url = '/categories/'. $category->cid;
+    $title = ' '. t('in category') .' '. $category->title;
     $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = %d ORDER BY timestamp DESC, iid DESC';
     $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10));
   }
@@ -1237,7 +1237,7 @@ function aggregator_page_rss() {
         $item->description = '';
         break;
     }
-    $items .= format_rss_item($item->ftitle . ': ' . $item->title, $item->link, $item->description, array('pubDate' => date('r', $item->timestamp)));
+    $items .= format_rss_item($item->ftitle .': '. $item->title, $item->link, $item->description, array('pubDate' => date('r', $item->timestamp)));
   }
 
   $output .= "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
@@ -1421,7 +1421,7 @@ function theme_aggregator_page_item($ite
  * Safely render HTML content, as allowed.
  */
 function aggregator_filter_xss($value) {
-  return filter_xss($value, preg_split('/\s+|<|>/', variable_get("aggregator_allowed_html_tags", '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'), -1, PREG_SPLIT_NO_EMPTY));
+  return filter_xss($value, preg_split('/\s+|<|>/', variable_get('aggregator_allowed_html_tags', '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'), -1, PREG_SPLIT_NO_EMPTY));
 }
 
 /**
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.103
diff -u -u -p -r1.103 blogapi.module
--- modules/blogapi/blogapi.module	26 Mar 2007 06:30:06 -0000	1.103
+++ modules/blogapi/blogapi.module	7 Apr 2007 19:36:57 -0000
@@ -138,7 +138,7 @@ function blogapi_blogger_get_users_blogs
     $types = _blogapi_get_node_types();
     $structs = array();
     foreach ($types as $type) {
-      $structs[] = array('url' => url('blog/' . $user->uid, array('absolute' => TRUE)), 'blogid' => $type, 'blogName' => $user->name . ": " . $type);
+      $structs[] = array('url' => url('blog/'. $user->uid, array('absolute' => TRUE)), 'blogid' => $type, 'blogName' => $user->name .": ". $type);
     }
     return $structs;
   }
@@ -161,7 +161,7 @@ function blogapi_blogger_get_user_info($
       'firstname' => $name[0],
       'nickname' => $user->name,
       'email' => $user->mail,
-      'url' => url('blog/' . $user->uid, array('absolute' => TRUE)));
+      'url' => url('blog/'. $user->uid, array('absolute' => TRUE)));
   }
   else {
     return blogapi_error($user);
@@ -582,7 +582,7 @@ function blogapi_init() {
 function blogapi_rsd() {
   global $base_url;
 
-  $xmlrpc = $base_url .'/'. 'xmlrpc.php';
+  $xmlrpc = $base_url .'/xmlrpc.php';
   $base = url('', array('absolute' => TRUE));
   $blogid = 1; # until we figure out how to handle multiple bloggers
 
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.415
diff -u -u -p -r1.415 book.module
--- modules/book/book.module	6 Apr 2007 13:27:21 -0000	1.415
+++ modules/book/book.module	7 Apr 2007 19:36:57 -0000
@@ -711,7 +711,7 @@ function theme_book_export_html($title, 
   $html .= '<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">';
   $html .= "<head>\n<title>". $title ."</title>\n";
   $html .= '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
-  $html .= '<base href="'. $base_url .'/" />' . "\n";
+  $html .= '<base href="'. $base_url .'/" />'."\n";
   $html .= "<style type=\"text/css\">\n@import url(misc/print.css);\n</style>\n";
   $html .= "</head>\n<body>\n". $content ."\n</body>\n</html>\n";
   return $html;
@@ -869,7 +869,7 @@ function theme_book_admin_table($form) {
       drupal_render($form[$key]['weight']),
       l(t('view'), 'node/'. $nid),
       l(t('edit'), 'node/'. $nid .'/edit'),
-      l(t('delete'), 'node/'. $nid .'/delete', NULL, 'destination=admin/content/book'. (arg(3) == 'orphan' ? '/orphan' : '') . ($pid != $nid ? '/'.$pid : ''))
+      l(t('delete'), 'node/'. $nid .'/delete', NULL, 'destination=admin/content/book'. (arg(3) == 'orphan' ? '/orphan' : '') . ($pid != $nid ? '/'. $pid : ''))
     );
   }
 
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.536
diff -u -u -p -r1.536 comment.module
--- modules/comment/comment.module	6 Apr 2007 13:27:21 -0000	1.536
+++ modules/comment/comment.module	7 Apr 2007 19:36:57 -0000
@@ -1820,7 +1820,7 @@ function comment_controls_submit($form_i
 
 function theme_comment($comment, $links = array()) {
   $output  = '<div class="comment'. ($comment->status == COMMENT_NOT_PUBLISHED ? ' comment-unpublished' : '') .'">';
-  $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) . ' ' . theme('mark', $comment->new) ."</div>\n";
+  $output .= '<div class="subject">'. l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) .' '. theme('mark', $comment->new) ."</div>\n";
   $output .= '<div class="credit">'. t('by %a on %b', array('%a' => theme('username', $comment), '%b' => format_date($comment->timestamp))) ."</div>\n";
   $output .= '<div class="body">'. $comment->comment .'</div>';
   $output .= '<div class="clear"><div>—</div>'. $comment->signature .'</div>';
@@ -1831,7 +1831,7 @@ function theme_comment($comment, $links 
 
 function theme_comment_folded($comment) {
   $output  = "<div class=\"comment-folded\">\n";
-  $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/'. $comment->cid, array('fragment' => "comment-$comment->cid")) . ' '. theme('mark', $comment->new) .'</span> ';
+  $output .= ' <span class="subject">'. l($comment->subject, comment_node_url() .'/'. $comment->cid, array('fragment' => "comment-$comment->cid")) .' '. theme('mark', $comment->new) .'</span> ';
   $output .= '<span class="credit">'. t('by') .' '. theme('username', $comment) ."</span>\n";
   $output .= "</div>\n";
   return $output;
Index: modules/contact/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/contact/contact.module,v
retrieving revision 1.79
diff -u -u -p -r1.79 contact.module
--- modules/contact/contact.module	27 Mar 2007 05:13:53 -0000	1.79
+++ modules/contact/contact.module	7 Apr 2007 19:36:58 -0000
@@ -27,7 +27,7 @@ function contact_help($section) {
         $menu_note = '';
       }
       $output .= '<p>'. t('The contact module also adds a <a href="@menu-settings">menu item</a> (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menu'))) .' '. $menu_note .'</p>';
-      return($output);
+      return $output;
   }
 }
 
@@ -235,7 +235,7 @@ function contact_admin_edit_submit($form
     db_query('UPDATE {contact} SET selected = 0');
   }
   $recipients = explode(',', $form_values['recipients']);
-  foreach ($recipients as $key=>$recipient) {
+  foreach ($recipients as $key => $recipient) {
     // E-mail address validation has already been done in _validate.
     $recipients[$key] = trim($recipient);
   }
@@ -550,6 +550,6 @@ function contact_mail_page_submit($form_
   drupal_set_message(t('Your message has been sent.'));
 
   // Jump to home page rather than back to contact page to avoid contradictory messages if flood control has been activated.
-  return('');
+  return '';
 }
 
Index: modules/drupal/drupal.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/drupal/drupal.module,v
retrieving revision 1.141
diff -u -u -p -r1.141 drupal.module
--- modules/drupal/drupal.module	6 Apr 2007 13:27:21 -0000	1.141
+++ modules/drupal/drupal.module	7 Apr 2007 19:36:58 -0000
@@ -240,8 +240,8 @@ function theme_client_list($clients) {
   // The mission is stripped of any HTML tags to keep the output simple and consistent.
   $output = "\n<dl>\n";
   foreach ($clients as $client) {
-    $output .= '  <dt><a href="' . check_url($client->link) . '">' . check_plain($client->name) . '</a> - ' . check_plain($client->slogan) . "</dt>\n";
-    $output .= '  <dd>' . strip_tags($client->mission) . "</dd>\n";
+    $output .= '  <dt><a href="'. check_url($client->link) .'">'. check_plain($client->name) .'</a> - '. check_plain($client->slogan) ."</dt>\n";
+    $output .= '  <dd>'. strip_tags($client->mission) ."</dd>\n";
   }
   $output .= "</dl>\n";
   return $output;
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.167
diff -u -u -p -r1.167 filter.module
--- modules/filter/filter.module	6 Apr 2007 13:27:21 -0000	1.167
+++ modules/filter/filter.module	7 Apr 2007 19:36:58 -0000
@@ -173,7 +173,7 @@ function filter_filter_tips($delta, $for
                 'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'Drupal') .'</a>'),
                 'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with <br />line break')),
                 'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>'. t('Paragraph one.') .'</p> <p>'. t('Paragraph two.') .'</p>'),
-                'strong' => array( t('Strong'), '<strong>'. t('Strong'). '</strong>'),
+                'strong' => array( t('Strong'), '<strong>'. t('Strong') .'</strong>'),
                 'em' => array( t('Emphasized'), '<em>'. t('Emphasized') .'</em>'),
                 'cite' => array( t('Cited'), '<cite>'. t('Cited') .'</cite>'),
                 'code' => array( t('Coded text used to show programming source code'), '<code>'. t('Coded') .'</code>'),
@@ -315,7 +315,7 @@ function filter_admin_overview() {
     $default = ($id == variable_get('filter_default_format', 1));
     $options[$id] = '';
     $form[$format->name]['id'] = array('#value' => $id);
-    $form[$format->name]['roles'] = array('#value' => $default ? t('All roles may use default format') : ($roles ? implode(', ',$roles) : t('No roles may use this format')));
+    $form[$format->name]['roles'] = array('#value' => $default ? t('All roles may use default format') : ($roles ? implode(', ', $roles) : t('No roles may use this format')));
     $form[$format->name]['configure'] = array('#value' => l(t('configure'), 'admin/settings/filters/'. $id));
     $form[$format->name]['delete'] = array('#value' => $default ? '' : l(t('delete'), 'admin/settings/filters/delete/'. $id));
   }
@@ -633,7 +633,7 @@ function filter_formats($index = NULL) {
         $where[] = "roles LIKE '%%,%d,%%'";
         $args[] = $rid;
       }
-      $query .= ' WHERE '. implode(' OR ', $where) . ' OR format = %d';
+      $query .= ' WHERE '. implode(' OR ', $where) .' OR format = %d';
       $args[] = variable_get('filter_default_format', 1);
     }
 
@@ -934,7 +934,7 @@ function theme_filter_tips($tips, $long 
 
       $tips = '';
       foreach ($tiplist as $tip) {
-        $tips .= '<li'. ($long ? ' id="filter-'. str_replace("/", "-", $tip['id']) .'">' : '>') . $tip['tip'] . '</li>';
+        $tips .= '<li'. ($long ? ' id="filter-'. str_replace("/", "-", $tip['id']) .'">' : '>') . $tip['tip'] .'</li>';
       }
 
       if ($tips) {
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.391
diff -u -u -p -r1.391 forum.module
--- modules/forum/forum.module	6 Apr 2007 13:27:21 -0000	1.391
+++ modules/forum/forum.module	7 Apr 2007 19:36:58 -0000
@@ -217,7 +217,7 @@ function forum_admin_settings() {
     '#options' => $number,
     '#description' => t('The default number of topics displayed per page; links to browse older messages are automatically being displayed.'),
   );
-  $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4=> t('Posts - least active first'));
+  $forder = array(1 => t('Date - newest first'), 2 => t('Date - oldest first'), 3 => t('Posts - most active first'), 4 => t('Posts - least active first'));
   $form['forum_order'] = array('#type' => 'radios',
     '#title' => t('Default order'),
     '#default_value' => variable_get('forum_order', '1'),
@@ -365,7 +365,7 @@ function forum_submit(&$node) {
         $node->tid = $term;
       }
     }
-    $old_tid = db_result(db_query_range("SELECT tid FROM {forum} WHERE nid = %d ORDER BY vid DESC", $node->nid, 0,1));
+    $old_tid = db_result(db_query_range("SELECT tid FROM {forum} WHERE nid = %d ORDER BY vid DESC", $node->nid, 0, 1));
     if ($old_tid) {
       if (($node->tid != $old_tid) && $node->shadow) {
         // A shadow copy needs to be created. Retain new term and add old term.
@@ -640,7 +640,7 @@ function forum_overview() {
     }
   }
   else {
-    $rows[] = array(array('data' => '<em>' . t('There are no existing containers or forums. You may add some on the <a href="@container">add container</a> or <a href="@forum">add forum</a> pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) . '</em>', 'colspan' => 2));
+    $rows[] = array(array('data' => '<em>'. t('There are no existing containers or forums. You may add some on the <a href="@container">add container</a> or <a href="@forum">add forum</a> pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) .'</em>', 'colspan' => 2));
   }
   return theme('table', $header, $rows);
 }
Index: modules/help/help.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/help/help.module,v
retrieving revision 1.70
diff -u -u -p -r1.70 help.module
--- modules/help/help.module	24 Jan 2007 14:48:36 -0000	1.70
+++ modules/help/help.module	7 Apr 2007 19:36:58 -0000
@@ -111,7 +111,7 @@ function help_page() {
   $name = arg(2);
   $output = '';
   if (module_hook($name, 'help')) {
-    $module = _module_parse_info_file(drupal_get_path('module', $name).'/'. $name .'.info');
+    $module = _module_parse_info_file(drupal_get_path('module', $name) .'/'. $name .'.info');
     drupal_set_title($module['name']);
 
     $temp = module_invoke($name, 'help', "admin/help#$name");
Index: modules/locale/locale.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v
retrieving revision 1.163
diff -u -u -p -r1.163 locale.module
--- modules/locale/locale.module	28 Mar 2007 14:08:22 -0000	1.163
+++ modules/locale/locale.module	7 Apr 2007 19:36:58 -0000
@@ -155,7 +155,7 @@ function locale_user($type, $edit, &$use
       $user->language = $default->language;
     }
     $names = array();
-    foreach($languages as $langcode => $language) {
+    foreach ($languages as $langcode => $language) {
       $names[$langcode] = t($language->name) .' ('. $language->native .')';
     }
     $form['locale'] = array('#type' => 'fieldset',
@@ -246,7 +246,7 @@ function locale($string) {
         }
       }
       // Clear locale cache in DB
-      cache_clear_all('locale:' . $language->language, 'cache');
+      cache_clear_all('locale:'. $language->language, 'cache');
     }
   }
 
@@ -268,7 +268,7 @@ function locale_refresh_cache() {
     while ($data = db_fetch_object($result)) {
       $t[$data->source] = (empty($data->translation) ? TRUE : $data->translation);
     }
-    cache_set('locale:' . $language->language, 'cache', serialize($t));
+    cache_set('locale:'. $language->language, 'cache', serialize($t));
   }
 }
 
@@ -328,7 +328,7 @@ function locale_language_list($field = '
     $languages = $languages[1];
   }
   $list = array();
-  foreach($languages as $language) {
+  foreach ($languages as $language) {
     $list[$language->language] = ($field == 'name') ? t($language->name) : $language->$field;
   }
   return $list;
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.27
diff -u -u -p -r1.27 content_types.inc
--- modules/node/content_types.inc	27 Mar 2007 05:13:54 -0000	1.27
+++ modules/node/content_types.inc	7 Apr 2007 19:36:58 -0000
@@ -109,7 +109,7 @@ function node_type_form($type = NULL) {
 
   $form['submission'] = array(
     '#type' => 'fieldset',
-    '#title' =>t('Submission form'),
+    '#title' => t('Submission form'),
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
@@ -147,7 +147,7 @@ function node_type_form($type = NULL) {
   );
   $form['workflow'] = array(
     '#type' => 'fieldset',
-    '#title' =>t('Workflow'),
+    '#title' => t('Workflow'),
     '#collapsible' => TRUE,
   );
   $form['workflow']['node_options'] = array('#type' => 'checkboxes',
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.217
diff -u -u -p -r1.217 search.module
--- modules/search/search.module	6 Apr 2007 13:27:22 -0000	1.217
+++ modules/search/search.module	7 Apr 2007 19:36:59 -0000
@@ -233,7 +233,7 @@ function search_admin_settings() {
     }
   }
   $count = format_plural($remaining, 'There is 1 item left to index.', 'There are @count items left to index.');
-  $percentage = ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) . '%';
+  $percentage = ((int)min(100, 100 * ($total - $remaining) / max(1, $total))) .'%';
   $status = '<p><strong>'. t('%percentage of the site has been indexed.', array('%percentage' => $percentage)) .' '. $count .'</strong></p>';
   $form['status'] = array('#type' => 'fieldset', '#title' => t('Indexing status'));
   $form['status']['status'] = array('#value' => $status);
@@ -385,7 +385,7 @@ function search_simplify($text) {
 
   // With the exception of the rules above, we consider all punctuation,
   // marks, spacers, etc, to be a word boundary.
-  $text = preg_replace('/['. PREG_CLASS_SEARCH_EXCLUDE . ']+/u', ' ', $text);
+  $text = preg_replace('/['. PREG_CLASS_SEARCH_EXCLUDE .']+/u', ' ', $text);
 
   return $text;
 }
@@ -1198,7 +1198,7 @@ function search_excerpt($keys, $text) {
 
   // If we didn't find anything, return the beginning.
   if (count($ranges) == 0) {
-    return truncate_utf8($text, 256) . ' ...';
+    return truncate_utf8($text, 256) .' ...';
   }
 
   // Sort the text ranges by starting position.
@@ -1228,7 +1228,7 @@ function search_excerpt($keys, $text) {
   foreach ($newranges as $from => $to) {
     $out[] = substr($text, $from, $to - $from);
   }
-  $text = (isset($newranges[0]) ? '' : '... '). implode(' ... ', $out) .' ...';
+  $text = (isset($newranges[0]) ? '' : '... ') . implode(' ... ', $out) .' ...';
 
   // Highlight keywords. Must be done at once to prevent conflicts ('strong' and '<strong>').
   $text = preg_replace('/'. $boundary .'('. implode('|', $keys) .')'. $boundary .'/iu', '<strong>\0</strong>', $text);
@@ -1275,7 +1275,7 @@ function theme_search_item($item, $type)
   if (isset($item['extra']) && is_array($item['extra'])) {
     $info = array_merge($info, $item['extra']);
   }
-  $output .= ' <dd>'. (!empty($item['snippet']) ? '<p>'. $item['snippet'] . '</p>' : '') . '<p class="search-info">' . implode(' - ', $info) .'</p></dd>';
+  $output .= ' <dd>'. (!empty($item['snippet']) ? '<p>'. $item['snippet'] .'</p>' : '') .'<p class="search-info">'. implode(' - ', $info) .'</p></dd>';
   return $output;
 }
 
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.255
diff -u -u -p -r1.255 statistics.module
--- modules/statistics/statistics.module	27 Mar 2007 05:13:54 -0000	1.255
+++ modules/statistics/statistics.module	7 Apr 2007 19:36:59 -0000
@@ -199,7 +199,7 @@ function statistics_node_tracker() {
         array('data' => t('User'), 'field' => 'u.name'),
         array('data' => t('Operations')));
 
-    $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), 30, 0, NULL, $node->nid);
+    $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\''. tablesort_sql($header), 30, 0, NULL, $node->nid);
     $rows = array();
     while ($log = db_fetch_object($result)) {
       $rows[] = array(
@@ -229,7 +229,7 @@ function statistics_user_tracker() {
         array('data' => t('Page'), 'field' => 'path'),
         array('data' => t('Operations')));
 
-    $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d' . tablesort_sql($header), 30, 0, NULL, $account->uid);
+    $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d'. tablesort_sql($header), 30, 0, NULL, $account->uid);
     while ($log = db_fetch_object($result)) {
       $rows[] = array(
         array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
@@ -258,7 +258,7 @@ function statistics_recent_hits() {
     array('data' => t('Operations'))
   );
 
-  $sql = 'SELECT a.aid, a.path, a.title, a.uid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.uid = a.uid' . tablesort_sql($header);
+  $sql = 'SELECT a.aid, a.path, a.title, a.uid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.uid = a.uid'. tablesort_sql($header);
 
   $result = pager_query($sql, 30);
   $rows = array();
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.463
diff -u -u -p -r1.463 system.module
--- modules/system/system.module	6 Apr 2007 14:31:51 -0000	1.463
+++ modules/system/system.module	7 Apr 2007 19:37:00 -0000
@@ -350,7 +350,7 @@ function system_user($type, $edit, &$use
     if (variable_get('configurable_timezones', 1)) {
       $zones = _system_zonelist();
       $form['timezone'] = array(
-        '#type'=>'fieldset',
+        '#type' => 'fieldset',
         '#title' => t('Locale settings'),
         '#weight' => 6,
         '#collapsible' => TRUE,
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.346
diff -u -u -p -r1.346 taxonomy.module
--- modules/taxonomy/taxonomy.module	6 Apr 2007 13:27:22 -0000	1.346
+++ modules/taxonomy/taxonomy.module	7 Apr 2007 19:37:01 -0000
@@ -202,7 +202,7 @@ function taxonomy_overview_terms($vocabu
     if (($start_from && ($start_from * $page_increment) >= $total_entries) || ($displayed_count == $page_increment)) {
       continue;
     }
-    $rows[] = array(str_repeat('--', $term->depth) . ' ' . l($term->name, "taxonomy/term/$term->tid"), l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => $destination)));
+    $rows[] = array(str_repeat('--', $term->depth) .' '. l($term->name, "taxonomy/term/$term->tid"), l(t('edit'), "admin/content/taxonomy/edit/term/$term->tid", array('query' => $destination)));
     $displayed_count++; // we're counting tids displayed
   }
 
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.157
diff -u -u -p -r1.157 upload.module
--- modules/upload/upload.module	6 Apr 2007 13:27:23 -0000	1.157
+++ modules/upload/upload.module	7 Apr 2007 19:37:01 -0000
@@ -108,7 +108,7 @@ function upload_init() {
         if (strpos($filename, file_directory_path()) !== FALSE) {
           $filename = trim(substr($filename, strlen(file_directory_path())), '\\/');
         }
-        $filename = 'system/files/' . $filename;
+        $filename = 'system/files/'. $filename;
       }
       $_SESSION['file_previews'][$fid]->_filename = $filename;
       menu_set_item($filename, $item);
@@ -129,7 +129,7 @@ function upload_admin_settings_validate(
   $default_uploadsize = $form_values['upload_uploadsize_default'];
   $default_usersize = $form_values['upload_usersize_default'];
 
-  $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())).'<br/>';
+  $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())) .'<br/>';
   $more_info = t("Depending on your sever environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory.");
 
   if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) {
@@ -222,7 +222,7 @@ function upload_admin_settings() {
     '#field_suffix' => t('MB')
   );
 
-  $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))).'</p>');
+  $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'</p>');
 
   $roles = user_roles(0, 'upload files');
   $form['roles'] = array('#type' => 'value', '#value' => $roles);
@@ -301,7 +301,7 @@ function _upload_prepare(&$node) {
 
   // Clean up old file previews if a post didn't get the user to this page.
   // i.e. the user left the edit page, because they didn't want to upload anything.
-  if(count($_POST) == 0) {
+  if (count($_POST) == 0) {
     if (!empty($_SESSION['file_previews']) && is_array($_SESSION['file_previews'])) {
       foreach ($_SESSION['file_previews'] as $fid => $file) {
         file_delete($file->filepath);
@@ -329,7 +329,7 @@ function _upload_prepare(&$node) {
     $key = 'upload_'. (isset($_SESSION['file_previews']) ? 0 : count($_SESSION['file_previews']));
     $file->fid = $key;
     $file->source = $key;
-    $file->list = variable_get('upload_list_default',1);
+    $file->list = variable_get('upload_list_default', 1);
     $_SESSION['file_previews'][$key] = $file;
 
     // Store the uploaded fid for this page request in case of submit without
@@ -796,7 +796,7 @@ function _upload_form($node) {
       // if the file was uploaded this page request, set value. this fixes the problem
       // formapi has recognizing new checkboxes. see comments in _upload_prepare.
       if (isset($_SESSION['file_current_upload']) && $_SESSION['file_current_upload'] == $file->fid) {
-        $form['files'][$key]['list']['#value'] = variable_get('upload_list_default',1);
+        $form['files'][$key]['list']['#value'] = variable_get('upload_list_default', 1);
       }
       $form['files'][$key]['filename'] = array('#type' => 'value',  '#value' => $file->filename);
       $form['files'][$key]['filepath'] = array('#type' => 'value',  '#value' => $file->filepath);
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.765
diff -u -u -p -r1.765 user.module
--- modules/user/user.module	6 Apr 2007 14:27:22 -0000	1.765
+++ modules/user/user.module	7 Apr 2007 19:37:01 -0000
@@ -1268,7 +1268,7 @@ function user_pass_reset($uid, $timestam
 
 function user_pass_reset_url($account) {
   $timestamp = time();
-  return url("user/reset/$account->uid/$timestamp/".user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE));
+  return url("user/reset/$account->uid/$timestamp/". user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE));
 }
 
 function user_pass_rehash($password, $timestamp, $login) {
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.7
diff -u -u -p -r1.7 template.php
--- themes/garland/template.php	6 Apr 2007 13:27:23 -0000	1.7
+++ themes/garland/template.php	7 Apr 2007 19:37:02 -0000
@@ -45,7 +45,7 @@ function phptemplate_comment_wrapper($co
   if (isset($type)) $node_type = $type;
 
   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>';