aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/assets/javascript/core.js
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-24 14:34:10 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-24 14:34:10 +0100
commitc9338b38b35675bd1d620e4a8ca7d44a522faace (patch)
tree0746db7f0eb5f22780c04e3ece5fb6a549045860 /phpBB/assets/javascript/core.js
parente6aaef6066549696453063417167e5a79c53b353 (diff)
parent46b3c3ecc43721e53c9711a196e91c300e03a1c8 (diff)
downloadforums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.gz
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.bz2
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.tar.xz
forums-c9338b38b35675bd1d620e4a8ca7d44a522faace.zip
Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars
Diffstat (limited to 'phpBB/assets/javascript/core.js')
-rw-r--r--phpBB/assets/javascript/core.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index f7d6688f68..c18bec7035 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -342,12 +342,6 @@ phpbb.ajaxify = function(options) {
var alert;
alert = phpbb.alert(dark.attr('data-ajax-error-title'), dark.attr('data-ajax-error-text'));
-
- setTimeout(function () {
- dark.fadeOut(phpbb.alert_time, function() {
- alert.hide();
- });
- }, 5000);
}
// If the element is a form, POST must be used and some extra data must