diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-13 15:42:42 +0200 | 
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-13 15:42:42 +0200 | 
| commit | a50e2c0c472097be9d87ea2dd23c37980b554dfd (patch) | |
| tree | 3376028793090e6f34648066c298e00b6485d6b0 /phpBB | |
| parent | 2c65b9b133ffc3ee958ce9d5a579f7d58741292d (diff) | |
| parent | 5170cd67fbbb7c120a1321b24c9fa3dc1f0a6a5c (diff) | |
| download | forums-a50e2c0c472097be9d87ea2dd23c37980b554dfd.tar forums-a50e2c0c472097be9d87ea2dd23c37980b554dfd.tar.gz forums-a50e2c0c472097be9d87ea2dd23c37980b554dfd.tar.bz2 forums-a50e2c0c472097be9d87ea2dd23c37980b554dfd.tar.xz forums-a50e2c0c472097be9d87ea2dd23c37980b554dfd.zip  | |
Merge branch 'ticket/13939' into prep-release-3.1.5
Diffstat (limited to 'phpBB')
| -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);  | 
