diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-10-29 10:08:52 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-10-29 10:08:52 +0000 |
| commit | 838b4331106b082bee0c375d440960c34148357d (patch) | |
| tree | e7d0718c423c9119529fa95cefa7f4dba7d80f01 | |
| parent | ae2e4ccd78dd8b04030a1ea3ba14847c4668382f (diff) | |
| download | brdo-838b4331106b082bee0c375d440960c34148357d.tar.gz brdo-838b4331106b082bee0c375d440960c34148357d.tar.bz2 | |
- Patch #319666 by Dave Reid: remove unnecessary boolean ternary conditaionals.
| -rw-r--r-- | install.php | 4 | ||||
| -rw-r--r-- | modules/block/block.admin.inc | 2 | ||||
| -rw-r--r-- | modules/book/book.module | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 2 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.admin.inc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/install.php b/install.php index 21ad8f755..cd7ee8d2a 100644 --- a/install.php +++ b/install.php @@ -584,7 +584,7 @@ function install_select_locale_form(&$form_state, $locales) { $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($profile, $verify) { } elseif ($writable) { $requirements['settings file'] = array( - 'title' => st('Settings file'), + 'title' => st('Settings file'), 'value' => st('Settings file is writable.'), ); } diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 9e16f8af6..8001bef83 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -385,7 +385,7 @@ function template_preprocess_block_admin_display_form(&$variables) { $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']); diff --git a/modules/book/book.module b/modules/book/book.module index 9bdc23b15..07ea3cc74 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -951,7 +951,7 @@ function template_preprocess_book_export_html(&$variables) { $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(); } diff --git a/modules/node/node.module b/modules/node/node.module index 4fa229e5e..2101c671e 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1757,7 +1757,7 @@ function node_feed($nids = FALSE, $channel = array()) { $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')) { diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc index 00a13985a..960558920 100644 --- a/modules/taxonomy/taxonomy.admin.inc +++ b/modules/taxonomy/taxonomy.admin.inc @@ -659,7 +659,7 @@ function taxonomy_form_term(&$form_state, $vocabulary, $edit = array()) { '#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 |