diff options
author | Justin Velluppillai <justin@innocraft.com> | 2022-05-16 04:44:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-16 04:44:52 +0300 |
commit | 7d6d2bc224eed1ff9be08848569e1d01ecac0d96 (patch) | |
tree | bb1e939d868298964f3e5ee77d37a564ffb7fff0 /core | |
parent | 28fd7e2d227b230a93548715e2ecffbeea5fabcf (diff) |
Merge 4.10.0 changes back to development branch (#19223)
* tweak QueryParameters type in index.d.ts to better match arbitrary object types (#19191)
* tweak QueryParameters type in index.d.ts to better match arbitrary object types
* make sure github action takes into account changes in CoreVue types
* add ability to use a deep watch in scope var watches in angularjs adapters (#19195)
* 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
* correctly destroy vue entry components in widgetloader (#19216)
* Release Matomo 4.10.0
Co-authored-by: dizzy <diosmosis@users.noreply.github.com>
Co-authored-by: Peter Zhang <peter@innocraft.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/AssetManager.php | 10 | ||||
-rw-r--r-- | core/Version.php | 2 |
2 files changed, 6 insertions, 6 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(); } } diff --git a/core/Version.php b/core/Version.php index 4ba05f11bd..0b44b74cd1 100644 --- a/core/Version.php +++ b/core/Version.php @@ -21,7 +21,7 @@ final class Version * The current Matomo version. * @var string */ - const VERSION = '4.10.0-rc1'; + const VERSION = '4.10.0'; const MAJOR_VERSION = 4; |