diff options
| author | Martin Keckeis <martin.keckeis1@gmail.com> | 2015-10-07 11:12:09 +0300 |
|---|---|---|
| committer | Martin Keckeis <martin.keckeis1@gmail.com> | 2015-10-07 11:12:09 +0300 |
| commit | f2434427fe843782d420b5ed236fb2b06fb87df8 (patch) | |
| tree | c8276dc234f536ab47f049487ae88cfaaacc430f /core/AssetManager.php | |
| parent | 7b593e7e38e1fc879e575ed894303c780c1f54c7 (diff) | |
Fixing #8529
Diffstat (limited to 'core/AssetManager.php')
| -rw-r--r-- | core/AssetManager.php | 10 |
1 files changed, 9 insertions, 1 deletions
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; } /** |