aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/core.js
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-23 00:58:12 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-23 00:58:12 +0200
commit7a464a83b579d90af5ae8b4ef7e2750ba6b9954b (patch)
tree46c65534041339a88f9af4d2227a1219b725ddba /phpBB/assets/javascript/core.js
parentadf5daa1c74a0d654cd5c55a52ee8616f02e6224 (diff)
parent6466002052bafa47f01d470a9a85201406aead1c (diff)
downloadforums-7a464a83b579d90af5ae8b4ef7e2750ba6b9954b.tar
forums-7a464a83b579d90af5ae8b4ef7e2750ba6b9954b.tar.gz
forums-7a464a83b579d90af5ae8b4ef7e2750ba6b9954b.tar.bz2
forums-7a464a83b579d90af5ae8b4ef7e2750ba6b9954b.tar.xz
forums-7a464a83b579d90af5ae8b4ef7e2750ba6b9954b.zip
Merge pull request #2480 from rxu/ticket/12572
[ticket/12572] Fix JS error when alert message title is undefined * rxu/ticket/12572: [ticket/12572] Fix JS error when alert message title is undefined
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r--phpBB/assets/javascript/core.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index cd633ed2ae..3cb41039cf 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -333,7 +333,9 @@ phpbb.ajaxify = function(options) {
// Hide the alert even if we refresh the page, in case the user
// presses the back button.
dark.fadeOut(phpbb.alertTime, function() {
- alert.hide();
+ if (typeof alert !== 'undefined') {
+ alert.hide();
+ }
});
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
}