makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 01:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* 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
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/assets/javascript/core.js
View file

@ -333,7 +333,9 @@ phpbb.ajaxify = function(options) {
// Hide the alert even if we refresh the page, in case the user // Hide the alert even if we refresh the page, in case the user
// presses the back button. // presses the back button.
dark.fadeOut(phpbb.alertTime, function() { dark.fadeOut(phpbb.alertTime, function() {
alert.hide(); if (typeof alert !== 'undefined') {
alert.hide();
}
}); });
}, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds }, res.REFRESH_DATA.time * 1000); // Server specifies time in seconds
} }