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

#59960, Can't store the value of submit, patch by Zen

4.7.x
Gerhard Killesreiter 2006-04-25 10:00:57 +00:00
parent 9e9e0e2c63
commit 3300aa2d4e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/form.inc
View File

@ -176,8 +176,6 @@ function drupal_validate_form($form_id, $form, $callback = NULL) {
function drupal_submit_form($form_id, $form, $callback = NULL) { function drupal_submit_form($form_id, $form, $callback = NULL) {
global $form_values; global $form_values;
$default_args = array($form_id, &$form_values); $default_args = array($form_id, &$form_values);
// Prevent system module forms (system/theme settings) from saving certain form fields to the variables table.
unset($GLOBALS['form_values']['submit'], $GLOBALS['form_values']['reset'], $GLOBALS['form_values']['form_id']);
if (isset($form['#submit'])) { if (isset($form['#submit'])) {
foreach ($form['#submit'] as $function => $args) { foreach ($form['#submit'] as $function => $args) {

6
modules/system.module
View File

@ -760,6 +760,9 @@ function system_theme_settings_submit($form_id, $values) {
$op = isset($_POST['op']) ? $_POST['op'] : ''; $op = isset($_POST['op']) ? $_POST['op'] : '';
$key = $values['var']; $key = $values['var'];
// Exclude unnecessary elements.
unset($values['var'], $values['submit'], $values['reset'], $values['form_id']);
if ($op == t('Reset to defaults')) { if ($op == t('Reset to defaults')) {
variable_del($key); variable_del($key);
drupal_set_message(t('The configuration options have been reset to their default values.')); drupal_set_message(t('The configuration options have been reset to their default values.'));
@ -786,6 +789,9 @@ function system_settings_form_submit($form_id, $values) {
$values['clean_url'] = 0; $values['clean_url'] = 0;
} }
// Exclude unnecessary elements.
unset($values['submit'], $values['reset'], $values['form_id']);
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
if ($op == t('Reset to defaults')) { if ($op == t('Reset to defaults')) {
variable_del($key); variable_del($key);

6
modules/system/system.module
View File

@ -760,6 +760,9 @@ function system_theme_settings_submit($form_id, $values) {
$op = isset($_POST['op']) ? $_POST['op'] : ''; $op = isset($_POST['op']) ? $_POST['op'] : '';
$key = $values['var']; $key = $values['var'];
// Exclude unnecessary elements.
unset($values['var'], $values['submit'], $values['reset'], $values['form_id']);
if ($op == t('Reset to defaults')) { if ($op == t('Reset to defaults')) {
variable_del($key); variable_del($key);
drupal_set_message(t('The configuration options have been reset to their default values.')); drupal_set_message(t('The configuration options have been reset to their default values.'));
@ -786,6 +789,9 @@ function system_settings_form_submit($form_id, $values) {
$values['clean_url'] = 0; $values['clean_url'] = 0;
} }
// Exclude unnecessary elements.
unset($values['submit'], $values['reset'], $values['form_id']);
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
if ($op == t('Reset to defaults')) { if ($op == t('Reset to defaults')) {
variable_del($key); variable_del($key);