summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-02-20 16:39:23 +0000
committerDries Buytaert <dries@buytaert.net>2006-02-20 16:39:23 +0000
commita94b87aa3a6a764983278fcaaa70fbe2bf6f6cd2 (patch)
treeb998134f90e3c9e548e7354ac0150b5519cda30f /modules
parent864eab75aa06a9d6433730f3523aa9106a955331 (diff)
downloadbrdo-a94b87aa3a6a764983278fcaaa70fbe2bf6f6cd2.tar.gz
brdo-a94b87aa3a6a764983278fcaaa70fbe2bf6f6cd2.tar.bz2
- Patch #46705 by killes: use += instead of array_merge().
Diffstat (limited to 'modules')
-rw-r--r--modules/taxonomy.module2
-rw-r--r--modules/taxonomy/taxonomy.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/taxonomy.module b/modules/taxonomy.module
index 8f3fe3f80..6232976e0 100644
--- a/modules/taxonomy.module
+++ b/modules/taxonomy.module
@@ -545,7 +545,7 @@ function taxonomy_form_alter($form_id, &$form) {
}
}
if (isset($form['taxonomy'])) {
- $form['taxonomy'] = array_merge($form['taxonomy'], array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3));
+ $form['taxonomy'] += array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3);
}
}
}
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 8f3fe3f80..6232976e0 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -545,7 +545,7 @@ function taxonomy_form_alter($form_id, &$form) {
}
}
if (isset($form['taxonomy'])) {
- $form['taxonomy'] = array_merge($form['taxonomy'], array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3));
+ $form['taxonomy'] += array('#type' => 'fieldset', '#title' => t('Categories'), '#collapsible' => TRUE, '#collapsed' => FALSE, '#tree' => TRUE, '#weight' => -3);
}
}
}