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/assets/javascript/core.js | |
| 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/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 9909359c2c..40da09377e 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -303,8 +303,8 @@ phpbb.ajaxify = function(options) { }, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds } } else { - // If confirmation is required, display a diologue to the user. - phpbb.confirm(res.MESSAGE_TEXT, function(del) { + // If confirmation is required, display a dialog to the user. + phpbb.confirm(res.MESSAGE_BODY, function(del) { if (del) { phpbb.loadingAlert(); data = $('<form>' + res.S_HIDDEN_FIELDS + '</form>').serialize(); |