diff options
author | Dries Buytaert <dries@buytaert.net> | 2005-12-15 16:24:40 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2005-12-15 16:24:40 +0000 |
commit | 922a46d28159737a61602876b961147f46428267 (patch) | |
tree | 395569ef52362721e2975658ca8a7362475d73c6 /modules/taxonomy | |
parent | 5accfa08f52a31da74715c38a1d7a12793fa33c7 (diff) | |
download | brdo-922a46d28159737a61602876b961147f46428267.tar.gz brdo-922a46d28159737a61602876b961147f46428267.tar.bz2 |
- Patch #34920 by Morbus/webchick/tangent: fixed order of form fields.
Diffstat (limited to 'modules/taxonomy')
-rw-r--r-- | modules/taxonomy/taxonomy.module | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index eda75a7b1..f2e07199f 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -131,7 +131,7 @@ function taxonomy_form_vocabulary($edit = array()) { $extra = module_invoke_all('taxonomy', 'form', 'vocabulary'); if (is_array($extra)) { foreach ($extra as $key => $element) { - $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $nodeapi[$key]['#weight'] : -18; + $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $extra[$key]['#weight'] : -18; } $form = array_merge($form, $extra); } @@ -242,7 +242,7 @@ function taxonomy_form_term($edit = array()) { $extra = module_invoke_all('taxonomy', 'term', 'vocabulary'); if (is_array($extra)) { foreach ($extra as $key => $element) { - $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $nodeapi[$key]['#weight'] : -18; + $extra[$key]['#weight'] = isset($extra[$key]['#weight']) ? $extra[$key]['#weight'] : -18; } $form = array_merge($form, $extra); } @@ -532,13 +532,12 @@ function taxonomy_form_alter($form_id, &$form) { } else { $ntterms = isset($node->taxonomy) ? $terms : array_keys($terms); - $form['taxonomy'][$vocabulary->vid] = taxonomy_form($vocabulary->vid, $ntterms, $help, 'taxonomy'); } } if (isset($form['taxonomy'])) { $form['taxonomy']['#tree'] = TRUE; - $form['taxonomy']['#weight'] = -15; + $form['taxonomy']['#weight'] = $vocabulary->weight; } } } |