summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/block/block.admin.inc2
-rw-r--r--modules/book/book.module2
-rw-r--r--modules/node/node.module2
-rw-r--r--modules/taxonomy/taxonomy.admin.inc2
4 files changed, 4 insertions, 4 deletions
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