#329660 by pwolanin: Remove silly drupal_goto() on rebuild permissions button.
parent
b963755551
commit
ad96ff71c1
|
@ -25,6 +25,7 @@ function node_configure() {
|
||||||
$form['access']['rebuild'] = array(
|
$form['access']['rebuild'] = array(
|
||||||
'#type' => 'submit',
|
'#type' => 'submit',
|
||||||
'#value' => t('Rebuild permissions'),
|
'#value' => t('Rebuild permissions'),
|
||||||
|
'#submit' => array('node_configure_access_submit'),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,8 +48,6 @@ function node_configure() {
|
||||||
'#description' => t('Must users preview posts before submitting?'),
|
'#description' => t('Must users preview posts before submitting?'),
|
||||||
);
|
);
|
||||||
|
|
||||||
$form['#validate'] = array('node_configure_validate');
|
|
||||||
|
|
||||||
return system_settings_form($form);
|
return system_settings_form($form);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,12 +59,10 @@ function _node_characters($length) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Form validate callback.
|
* Form button submit callback.
|
||||||
*/
|
*/
|
||||||
function node_configure_validate($form, &$form_state) {
|
function node_configure_access_submit($form, &$form_state) {
|
||||||
if ($form_state['values']['op'] == t('Rebuild permissions')) {
|
$form_state['redirect'] = 'admin/content/node-settings/rebuild';
|
||||||
drupal_goto('admin/content/node-settings/rebuild');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -82,7 +79,6 @@ function node_configure_rebuild_confirm() {
|
||||||
function node_configure_rebuild_confirm_submit($form, &$form_state) {
|
function node_configure_rebuild_confirm_submit($form, &$form_state) {
|
||||||
node_access_rebuild(TRUE);
|
node_access_rebuild(TRUE);
|
||||||
$form_state['redirect'] = 'admin/content/node-settings';
|
$form_state['redirect'] = 'admin/content/node-settings';
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue