diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-06 12:07:46 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-06 12:07:46 -0500 |
| commit | 02758cabbc8860b5026353a2f995077f5d7c2e76 (patch) | |
| tree | 917287070d7cabc4e419939033fa6133e028627b /phpBB/includes/functions.php | |
| parent | 597c16a9363858e343480f70b1852bce2bba5ca3 (diff) | |
| parent | 0bbde4c12291de7c2effdfbce2f87b212190799e (diff) | |
| download | forums-02758cabbc8860b5026353a2f995077f5d7c2e76.tar forums-02758cabbc8860b5026353a2f995077f5d7c2e76.tar.gz forums-02758cabbc8860b5026353a2f995077f5d7c2e76.tar.bz2 forums-02758cabbc8860b5026353a2f995077f5d7c2e76.tar.xz forums-02758cabbc8860b5026353a2f995077f5d7c2e76.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11166' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11166:
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 c0fd3918dc..98a2c0db79 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3158,8 +3158,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']; @@ -3171,8 +3172,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 |