summaryrefslogtreecommitdiff
path: root/modules/taxonomy
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-03-14 20:13:27 +0000
committerDries Buytaert <dries@buytaert.net>2009-03-14 20:13:27 +0000
commitb46e90ad366c57095183891de56894d6a449bc14 (patch)
treeef143eea19b24d749d790b95c82658c02fb444e4 /modules/taxonomy
parentc85fa2b0e17d59b826c8ed51cd888fe8adae249a (diff)
downloadbrdo-b46e90ad366c57095183891de56894d6a449bc14.tar.gz
brdo-b46e90ad366c57095183891de56894d6a449bc14.tar.bz2
- Patch #322344 by merlinofchaos, Frando, catch, sun: form improvements from Views.
Diffstat (limited to 'modules/taxonomy')
-rw-r--r--modules/taxonomy/taxonomy.admin.inc10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/taxonomy/taxonomy.admin.inc b/modules/taxonomy/taxonomy.admin.inc
index f809529c9..eb580c4d2 100644
--- a/modules/taxonomy/taxonomy.admin.inc
+++ b/modules/taxonomy/taxonomy.admin.inc
@@ -344,13 +344,13 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
// If this form was already submitted once, it's probably hit a validation
// error. Ensure the form is rebuilt in the same order as the user submitted.
- if (!empty($form_state['post'])) {
- $order = array_flip(array_keys($form_state['post'])); // Get the $_POST order.
+ if (!empty($form_state['input'])) {
+ $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
$current_page = array_merge($order, $current_page); // Update our form with the new order.
foreach ($current_page as $key => $term) {
// Verify this is a term for the current page and set at the current depth.
- if (is_array($form_state['post'][$key]) && is_numeric($form_state['post'][$key]['tid'])) {
- $current_page[$key]->depth = $form_state['post'][$key]['depth'];
+ if (is_array($form_state['input'][$key]) && is_numeric($form_state['input'][$key]['tid'])) {
+ $current_page[$key]->depth = $form_state['input'][$key]['depth'];
}
else {
unset($current_page[$key]);
@@ -440,7 +440,7 @@ function taxonomy_overview_terms_submit($form, &$form_state) {
return;
}
- $order = array_flip(array_keys($form['#post'])); // Get the $_POST order.
+ $order = array_flip(array_keys($form_state['input'])); // Get the $_POST order.
$form_state['values'] = array_merge($order, $form_state['values']); // Update our original form with the new order.
$vocabulary = $form['#vocabulary'];