#329660 by pwolanin: Remove silly drupal_goto() on rebuild permissions button.

merge-requests/26/head
Angie Byron 2008-11-03 22:43:56 +00:00
parent b963755551
commit ad96ff71c1
1 changed files with 4 additions and 8 deletions

View File

@ -25,6 +25,7 @@ function node_configure() {
$form['access']['rebuild'] = array(
'#type' => 'submit',
'#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?'),
);
$form['#validate'] = array('node_configure_validate');
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) {
if ($form_state['values']['op'] == t('Rebuild permissions')) {
drupal_goto('admin/content/node-settings/rebuild');
}
function node_configure_access_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/content/node-settings/rebuild';
}
/**
@ -82,7 +79,6 @@ function node_configure_rebuild_confirm() {
function node_configure_rebuild_confirm_submit($form, &$form_state) {
node_access_rebuild(TRUE);
$form_state['redirect'] = 'admin/content/node-settings';
return;
}
/**