diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:40:18 +0200 |
| commit | 2a662c5e07cdf14410bdc3cc48250443dfdeb269 (patch) | |
| tree | 56a5ce0b804d8a2428e91e77b083fa7afb2b1a33 /phpBB/assets/javascript/core.js | |
| parent | 2eceaaddf68d0d1f1dca741d49386e889cf1cc4e (diff) | |
| parent | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (diff) | |
| download | forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.gz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.bz2 forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.tar.xz forums-2a662c5e07cdf14410bdc3cc48250443dfdeb269.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/phpbb/user.php
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index cc016e52ee..84e27c3a49 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -106,7 +106,7 @@ phpbb.alert.open = function($alert) { $dark.fadeIn(phpbb.alertTime); } - if ($loadingIndicator.is(':visible')) { + if ($loadingIndicator && $loadingIndicator.is(':visible')) { $loadingIndicator.fadeOut(phpbb.alertTime, function() { $dark.append($alert); $alert.fadeIn(phpbb.alertTime); |