diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-06-03 09:47:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-03 09:47:44 +0300 |
commit | 7585967cbd80d7869f57a9adc69c02e8d14cbc33 (patch) | |
tree | 7b06afedbcb883175f02ffff141809d001097b64 /plugins/CorePluginsAdmin | |
parent | caf7dbf0fdd3e91a47fa49f297ed18a75ddeff9d (diff) |
Remove code tagged with `@deprecated` (#16001)
* remove some code tagged with deprecated
* some more tweaks
* remove more deprecated methods
* more deprecations
* remove old files
* remove more deprecated methods
* fix some tests
* update logviewer submodule
* fix some tests
* fix ui test
* another deprecation
* Update CHANGELOG.md
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* add test for dimensions provider
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CorePluginsAdmin')
-rw-r--r-- | plugins/CorePluginsAdmin/Controller.php | 16 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/templates/macros.twig | 4 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/templates/plugins.twig | 2 | ||||
-rw-r--r-- | plugins/CorePluginsAdmin/templates/themes.twig | 2 |
4 files changed, 4 insertions, 20 deletions
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 4eda3739ad..da005443f2 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -150,22 +150,6 @@ class Controller extends Plugin\ControllerAdmin return $view->render(); } - /** - * @deprecated - */ - public function browsePlugins() - { - $this->redirectToIndex('Marketplace', 'overview'); - } - - /** - * @deprecated - */ - public function browseThemes() - { - $this->redirectToIndex('Marketplace', 'overview', null, null, null, array('show' => 'themes')); - } - public function tagManagerTeaser() { $this->dieIfPluginsAdminIsDisabled(); diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index d5cb16bdff..db19df33df 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -290,9 +290,9 @@ {% if displayAdminLinks %} <div class="tableActionBar"> {% if isTheme %} - <a href="{{ linkTo({'action':'browseThemes', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewThemes'|translate }}</a> + <a href="{{ linkTo({'module': 'Marketplace','action':'overview', 'sort': '', 'show': 'themes'}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewThemes'|translate }}</a> {% else %} - <a href="{{ linkTo({'action':'browsePlugins', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewPlugins'|translate }}</a> + <a href="{{ linkTo({'module': 'Marketplace','action':'overview', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewPlugins'|translate }}</a> {% endif %} </div> {% endif %} diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig index e1b825ded6..14943ba94a 100644 --- a/plugins/CorePluginsAdmin/templates/plugins.twig +++ b/plugins/CorePluginsAdmin/templates/plugins.twig @@ -19,7 +19,7 @@ {% if isMarketplaceEnabled or isPluginUploadEnabled %} {{ 'CorePluginsAdmin_TeaserExtendPiwikByPlugin'|translate( - '<a href="' ~ linkTo({'action':'browsePlugins', 'sort': null, 'activated': null})|e('html_attr') ~ '">', + '<a href="' ~ linkTo({'module':'Marketplace', 'action':'overview', 'sort': null, 'activated': null})|e('html_attr') ~ '">', '</a>', '<a href="#" class="uploadPlugin">', '</a>' diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig index d898c3c799..32a4e56444 100644 --- a/plugins/CorePluginsAdmin/templates/themes.twig +++ b/plugins/CorePluginsAdmin/templates/themes.twig @@ -15,7 +15,7 @@ {{ 'CorePluginsAdmin_ThemesDescription'|translate }} {% if isMarketplaceEnabled %} - {{ 'CorePluginsAdmin_TeaserExtendPiwikByTheme'|translate('<a href="' ~ linkTo({'action':'browseThemes', 'sort': ''}) ~ '">', '</a>')|raw }} + {{ 'CorePluginsAdmin_TeaserExtendPiwikByTheme'|translate('<a href="' ~ linkTo({'module': 'Marketplace','action':'overview', 'sort': '', 'show': 'themes'}) ~ '">', '</a>')|raw }} {% endif %} {% if otherUsersCount > 0 %} |