Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #104575 by pwolanin and kkaefer: cleanup variables before saving.

5.x
Dries Buytaert 2006-12-23 15:39:35 +00:00
parent 0a0aa9e7c0
commit 5337232392
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/node/content_types.inc
View File

@ -284,18 +284,20 @@ function node_type_form_submit($form_id, $form_values) {
$status = node_type_save($type); $status = node_type_save($type);
$variables = $form_values;
// Remove everything that's been saved already - whatever's left is assumed // Remove everything that's been saved already - whatever's left is assumed
// to be a persistent variable. // to be a persistent variable.
foreach ($form_values as $key => $value) { foreach ($variables as $key => $value) {
if (isset($type->$key)) { if (isset($type->$key)) {
unset($form_values[$key]); unset($variables[$key]);
} }
} }
unset($form_values['type_display'], $form_values['old_type'], $form_values['orig_type'], $form_values['submit'], $form_values['delete'], $form_values['reset'], $form_values['form_id']); unset($variables['form_token'], $variables['op'], $variables['submit'], $variables['delete'], $variables['reset'], $variables['form_id']);
// Save or reset persistent variable values. // Save or reset persistent variable values.
foreach ($form_values as $key => $value) { foreach ($variables as $key => $value) {
$key .= '_'. $type->type; $key .= '_'. $type->type;
if ($op == t('Reset to defaults')) { if ($op == t('Reset to defaults')) {
variable_del($key); variable_del($key);