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:
authorStefan Giehl <stefan@matomo.org>2020-01-16 03:26:34 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2020-01-16 03:26:34 +0300
commit7c059ecb5e433dec3538398c8413c45cd68a0c0b (patch)
tree026af3bafbd20f69b1aca757151c1d51a3bdfcd6 /plugins/TwoFactorAuth
parent8e2db8e1206e6778f3198558b05c25d655fc99e6 (diff)
Removes some methods deprecated for Matomo 4 (#15386)
* Removes deprecated Plugin.getListHooksRegistered and uses Plugin.registerEvents instead * Removes deprecated method Piwik\Piwik::doAsSuperUser * Remove deprecated SettingsPiwik::isPiwikInstalled and use SettingsPiwik::isMatomoInstalled instead
Diffstat (limited to 'plugins/TwoFactorAuth')
-rw-r--r--plugins/TwoFactorAuth/TwoFactorAuth.php2
-rw-r--r--plugins/TwoFactorAuth/Validator.php4
-rw-r--r--plugins/TwoFactorAuth/config/test.php6
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TwoFactorAuth/TwoFactorAuth.php b/plugins/TwoFactorAuth/TwoFactorAuth.php
index fe1c3f465f..9b86925b36 100644
--- a/plugins/TwoFactorAuth/TwoFactorAuth.php
+++ b/plugins/TwoFactorAuth/TwoFactorAuth.php
@@ -109,7 +109,7 @@ class TwoFactorAuth extends \Piwik\Plugin
public function onApiGetTokenAuth($returnedValue, $params)
{
- if (!SettingsPiwik::isPiwikInstalled()) {
+ if (!SettingsPiwik::isMatomoInstalled()) {
return;
}
diff --git a/plugins/TwoFactorAuth/Validator.php b/plugins/TwoFactorAuth/Validator.php
index 77b4bb2714..382ad5f99c 100644
--- a/plugins/TwoFactorAuth/Validator.php
+++ b/plugins/TwoFactorAuth/Validator.php
@@ -34,7 +34,7 @@ class Validator
return false;
}
- if (!SettingsPiwik::isPiwikInstalled()) {
+ if (!SettingsPiwik::isMatomoInstalled()) {
return false;
}
@@ -45,7 +45,7 @@ class Validator
{
Piwik::checkUserIsNotAnonymous();
- if (!SettingsPiwik::isPiwikInstalled()) {
+ if (!SettingsPiwik::isMatomoInstalled()) {
throw new NotYetInstalledException('Matomo is not set up yet');
}
}
diff --git a/plugins/TwoFactorAuth/config/test.php b/plugins/TwoFactorAuth/config/test.php
index 7023790fe4..617eb132cd 100644
--- a/plugins/TwoFactorAuth/config/test.php
+++ b/plugins/TwoFactorAuth/config/test.php
@@ -6,7 +6,7 @@ return array(
'Piwik\Plugins\TwoFactorAuth\TwoFactorAuthentication' => DI\decorate(function ($previous) {
/** @var Piwik\Plugins\TwoFactorAuth\TwoFactorAuthentication $previous */
- if (!\Piwik\SettingsPiwik::isPiwikInstalled()) {
+ if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
return $previous;
}
@@ -30,7 +30,7 @@ return array(
'Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeDao' => DI\decorate(function ($previous) {
/** @var Piwik\Plugins\TwoFactorAuth\Dao\RecoveryCodeDao $previous */
- if (!\Piwik\SettingsPiwik::isPiwikInstalled()) {
+ if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
return $previous;
}
@@ -47,7 +47,7 @@ return array(
}),
'Piwik\Plugins\TwoFactorAuth\SystemSettings' => DI\decorate(function ($previous) {
/** @var Piwik\Plugins\TwoFactorAuth\SystemSettings $previous */
- if (!\Piwik\SettingsPiwik::isPiwikInstalled()) {
+ if (!\Piwik\SettingsPiwik::isMatomoInstalled()) {
return $previous;
}