Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12572] Fix JS error when alert message title is undefined
This commit is contained in:
Andreas Fischer 2014-05-23 00:58:12 +02:00
commit 59ca723174

View file

@ -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() {
if (typeof alert !== 'undefined') {
alert.hide();
}
});
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
}