summaryrefslogtreecommitdiff
path: root/modules/taxonomy/taxonomy.admin.inc
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-15 12:13:45 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-15 12:13:45 +0000
commit394e7f2e2065fe62abadab057e7ae4a2d0a57d16 (patch)
treea3feccd43eed743b9fdeda95b632802ac9378990 /modules/taxonomy/taxonomy.admin.inc
parentc5c46c739c5ef2b9170a67c501db7967ca814b3b (diff)
downloadbrdo-394e7f2e2065fe62abadab057e7ae4a2d0a57d16.tar.gz
brdo-394e7f2e2065fe62abadab057e7ae4a2d0a57d16.tar.bz2
- Patch #604980 by sun: factored taxonomy_term_edit() away.
Diffstat (limited to 'modules/taxonomy/taxonomy.admin.inc')
-rw-r--r--modules/taxonomy/taxonomy.admin.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index be5b9179e..110d43d5b 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -596,7 +596,11 @@ function theme_taxonomy_overview_terms($variables) {
* @ingroup forms
* @see taxonomy_form_term_submit()
*/
-function taxonomy_form_term($form, &$form_state, $vocabulary, $edit = array()) {
+function taxonomy_form_term($form, &$form_state, $edit = array(), $vocabulary = NULL) {
+ if (!isset($vocabulary) && is_object($edit)) {
+ $vocabulary = taxonomy_vocabulary_load($edit->vid);
+ $edit = (array)$edit;
+ }
$edit += array(
'name' => '',
'description' => '',