aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/core.js
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2015-06-14 17:38:04 +0200
committerJoas Schilling <nickvergessen@gmx.de>2015-06-14 17:38:04 +0200
commit7ccb19fa001cb0f76499fd19256e60df382c6d2a (patch)
treee556f0887841680da57c308fb3e371c076345b1d /phpBB/assets/javascript/core.js
parent89f7fc63e8713aa6c332dce5e77df6112af8d635 (diff)
parent8f5d76111243fae8d2926037e8fef0cbc97802c7 (diff)
downloadforums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar
forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.gz
forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.bz2
forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.xz
forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.zip
Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r--phpBB/assets/javascript/core.js2
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);