summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-09-17 19:17:24 +0000
committerDries Buytaert <dries@buytaert.net>2006-09-17 19:17:24 +0000
commitbf41b22cdfd086a87ceaa803417627f98bcb8cd4 (patch)
tree4511bca23d2a54ae33e6d3e25f9ac0beff363992
parent5f8027f94c04b495230bc57a798c923fd3d14644 (diff)
downloadbrdo-bf41b22cdfd086a87ceaa803417627f98bcb8cd4.tar.gz
brdo-bf41b22cdfd086a87ceaa803417627f98bcb8cd4.tar.bz2
- Patch #83914 by nickl: form API clean-up: remove stuff.
-rw-r--r--modules/menu/menu.module11
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 675a5f1fd..99d6b0282 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -187,14 +187,11 @@ function menu_perm() {
*/
function menu_form_alter($form_id, &$form) {
if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id) {
- $edit = isset($_POST) ? $_POST : '';
- $edit['nid'] = $form['nid']['#value'];
-
$item = array();
- if ($edit['nid'] > 0) {
- $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $edit['nid']));
- if (isset($edit['menu']) && is_array($edit['menu'])) {
- $item = !is_array($item) ? $edit['menu'] : (($_POST['op'] == t('Preview')) ? array_merge($item, $edit['menu']) : array_merge($edit['menu'], $item));
+ if ($form['nid']['#value'] > 0) {
+ $item = db_fetch_array(db_query("SELECT * FROM {menu} WHERE path = 'node/%d'", $form['nid']['#value']));
+ if (isset($form['#post']['menu']) && is_array($form['#post']['menu'])) {
+ $item = !is_array($item) ? $form['#post']['menu'] : (($form['#post']['op'] == t('Preview')) ? array_merge($item, $form['#post']['menu']) : array_merge($form['#post']['menu'], $item));
}
}