Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zhang <peter@innocraft.com>2022-05-13 01:52:51 +0300
committerGitHub <noreply@github.com>2022-05-13 01:52:51 +0300
commit0bd72e797bd418dfcf207f76aa00ffb1278bd5ec (patch)
tree6cec0355e43d8e4d9505227e83de9aabfbd41126
parent2cc5cd5b727f19c55515b08571b873f3a03dabea (diff)
covert getPluginUmdChunks from private to protected (#19212)
* set default color value, when key not exist. (#18696) * Update Sparkline.php add addition setup * Update Sparkline.php update foreach to array_merge * protected getPluginUmdChunks update private to protect
-rw-r--r--core/AssetManager.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/AssetManager.php b/core/AssetManager.php
index c403969f77..1eb8820f0d 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -159,7 +159,7 @@ class AssetManager extends Singleton
return $result;
}
- private function getPluginUmdChunks()
+ protected function getPluginUmdChunks()
{
$fetcher = $this->getPluginUmdJScriptFetcher();
@@ -349,11 +349,11 @@ class AssetManager extends Singleton
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;
}
@@ -510,12 +510,12 @@ class AssetManager extends Singleton
{
$mergedAsset = new InMemoryUIAsset();
$fetcher = new StaticUIAssetFetcher($files, $priorityOrder = array(), $theme = null);
-
+
$cacheBuster = UIAssetCacheBuster::getInstance();
$assetMerger = new JScriptUIAssetMerger($mergedAsset, $fetcher, $cacheBuster);
$assetMerger->generateFile();
-
+
return $mergedAsset->getContent();
}
}