Index: install.php
===================================================================
RCS file: /cvs/drupal/drupal/install.php,v
retrieving revision 1.134
diff -u -p -r1.134 install.php
--- install.php	1 Oct 2008 00:27:29 -0000	1.134
+++ install.php	10 Oct 2008 16:45:02 -0000
@@ -584,7 +584,7 @@ function install_select_locale_form(&$fo
     $form['locale'][$locale->name] = array(
       '#type' => 'radio',
       '#return_value' => $locale->name,
-      '#default_value' => ($locale->name == 'en' ? TRUE : FALSE),
+      '#default_value' => $locale->name == 'en',
       '#title' => $name . ($locale->name == 'en' ? ' ' . st('(built-in)') : ''),
       '#parents' => array('locale')
     );
@@ -940,7 +940,7 @@ function install_check_requirements($pro
     }
     elseif ($writable) {
       $requirements['settings file'] = array(
-        'title'       => st('Settings file'), 
+        'title'       => st('Settings file'),
         'value'       => st('Settings file is writable.'),
       );
     }
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.802
diff -u -p -r1.802 common.inc
--- includes/common.inc	9 Oct 2008 01:49:03 -0000	1.802
+++ includes/common.inc	10 Oct 2008 16:45:05 -0000
@@ -925,7 +925,7 @@ function flood_register_event($name) {
  */
 function flood_is_allowed($name, $threshold) {
   $number = db_result(db_query("SELECT COUNT(*) FROM {flood} WHERE event = '%s' AND hostname = '%s' AND timestamp > %d", $name, ip_address(), REQUEST_TIME - 3600));
-  return ($number < $threshold ? TRUE : FALSE);
+  return ($number < $threshold);
 }
 
 function check_file($filename) {
@@ -2704,7 +2704,7 @@ function drupal_system_listing($mask, $d
 
 /**
  * Hands off structured Drupal arrays to type-specific *_alter implementations.
- * 
+ *
  * This dispatch function hands off structured Drupal arrays to type-specific
  * *_alter implementations. It ensures a consistent interface for all altering
  * operations.
Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.19
diff -u -p -r1.19 block.admin.inc
--- modules/block/block.admin.inc	16 Jul 2008 21:59:25 -0000	1.19
+++ modules/block/block.admin.inc	10 Oct 2008 16:45:05 -0000
@@ -385,7 +385,7 @@ function template_preprocess_block_admin
       $variables['form'][$i]['weight']['#attributes']['class'] = 'block-weight block-weight-' . $region;
 
       $variables['block_listing'][$region][$i]->row_class = isset($block['#attributes']['class']) ? $block['#attributes']['class'] : '';
-      $variables['block_listing'][$region][$i]->block_modified = isset($block['#attributes']['class']) && strpos($block['#attributes']['class'], 'block-modified') !== FALSE ? TRUE : FALSE;
+      $variables['block_listing'][$region][$i]->block_modified = isset($block['#attributes']['class']) && strpos($block['#attributes']['class'], 'block-modified') !== FALSE;
       $variables['block_listing'][$region][$i]->block_title =  drupal_render($block['info']);
       $variables['block_listing'][$region][$i]->region_select = drupal_render($block['region']) . drupal_render($block['theme']);
       $variables['block_listing'][$region][$i]->weight_select = drupal_render($block['weight']);
Index: modules/book/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book.module,v
retrieving revision 1.471
diff -u -p -r1.471 book.module
--- modules/book/book.module	9 Oct 2008 15:15:50 -0000	1.471
+++ modules/book/book.module	10 Oct 2008 16:45:06 -0000
@@ -951,7 +951,7 @@ function template_preprocess_book_export
   $variables['title'] = check_plain($variables['title']);
   $variables['base_url'] = $base_url;
   $variables['language'] = $language;
-  $variables['language_rtl'] = (defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL) ? TRUE : FALSE;
+  $variables['language_rtl'] = defined('LANGUAGE_RTL') && $language->direction == LANGUAGE_RTL;
   $variables['head'] = drupal_get_html_head();
 }
 
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.982
diff -u -p -r1.982 node.module
--- modules/node/node.module	9 Oct 2008 15:15:51 -0000	1.982
+++ modules/node/node.module	10 Oct 2008 16:45:08 -0000
@@ -1753,7 +1753,7 @@ function node_feed($nids = FALSE, $chann
     $item->link = url("node/$nid", array('absolute' => TRUE));
 
     if ($item_length != 'title') {
-      $teaser = ($item_length == 'teaser') ? TRUE : FALSE;
+      $teaser = ($item_length == 'teaser');
 
       // Filter and prepare node teaser
       if (node_hook($item, 'view')) {
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.30
diff -u -p -r1.30 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	6 Oct 2008 23:15:32 -0000	1.30
+++ modules/taxonomy/taxonomy.admin.inc	10 Oct 2008 16:45:09 -0000
@@ -659,7 +659,7 @@ function taxonomy_form_term(&$form_state
     '#type' => 'fieldset',
     '#title' => t('Advanced options'),
     '#collapsible' => TRUE,
-    '#collapsed' => $vocabulary->hierarchy > 1 ? FALSE : TRUE,
+    '#collapsed' => $vocabulary->hierarchy < 2,
   );
 
   // taxonomy_get_tree and taxonomy_get_parents may contain large numbers of