From f2434427fe843782d420b5ed236fb2b06fb87df8 Mon Sep 17 00:00:00 2001 From: Martin Keckeis Date: Wed, 7 Oct 2015 10:12:09 +0200 Subject: Fixing #8529 --- core/AssetManager.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'core/AssetManager.php') diff --git a/core/AssetManager.php b/core/AssetManager.php index a1a1762a4b..407a2058c0 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -260,7 +260,15 @@ class AssetManager extends Singleton */ public function isMergedAssetsDisabled() { - return Config::getInstance()->Development['disable_merged_assets']; + if (Config::getInstance()->Development['disable_merged_assets'] == 1) { + return true; + } + + if (isset($_GET['disable_merged_assets']) && $_GET['disable_merged_assets'] == 1) { + return true; + } + + return false; } /** -- cgit v1.2.3