diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-12-18 13:31:38 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-12-18 13:50:56 +0100 |
| commit | 0d7f61dc7ab8b875b288b2d41ef27aa360973e57 (patch) | |
| tree | cd5f91d536998e57251a906b61f75874689e8b70 /phpBB/includes | |
| parent | 3af5531d0d8df7ed734e688780407014ff1840f8 (diff) | |
| download | forums-0d7f61dc7ab8b875b288b2d41ef27aa360973e57.tar forums-0d7f61dc7ab8b875b288b2d41ef27aa360973e57.tar.gz forums-0d7f61dc7ab8b875b288b2d41ef27aa360973e57.tar.bz2 forums-0d7f61dc7ab8b875b288b2d41ef27aa360973e57.tar.xz forums-0d7f61dc7ab8b875b288b2d41ef27aa360973e57.zip | |
[ticket/11166] Use provided custom templates on AJAX confirm box
PHPBB3-11166
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8ef5284134..fe42373862 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3084,8 +3084,9 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo 'YES_VALUE' => $user->lang['YES'], 'S_CONFIRM_ACTION' => $u_action, - 'S_HIDDEN_FIELDS' => $hidden . $s_hidden_fields) - ); + 'S_HIDDEN_FIELDS' => $hidden . $s_hidden_fields, + 'S_AJAX_REQUEST' => $request->is_ajax(), + )); $sql = 'UPDATE ' . USERS_TABLE . " SET user_last_confirm_key = '" . $db->sql_escape($confirm_key) . "' WHERE user_id = " . $user->data['user_id']; @@ -3097,8 +3098,9 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo $u_action .= '&confirm_uid=' . $user->data['user_id'] . '&sess=' . $user->session_id . '&sid=' . $user->session_id; $json_response = new phpbb_json_response; $json_response->send(array( + 'MESSAGE_BODY' => $template->assign_display('body'), 'MESSAGE_TITLE' => (!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title], - 'MESSAGE_TEXT' => (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'], + 'MESSAGE_TEXT' => (!isset($user->lang[$title . '_CONFIRM'])) ? $title : $user->lang[$title . '_CONFIRM'], 'YES_VALUE' => $user->lang['YES'], 'S_CONFIRM_ACTION' => str_replace('&', '&', $u_action), //inefficient, rewrite whole function |