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>2022-07-25 11:52:26 +0300
committerGitHub <noreply@github.com>2022-07-25 11:52:26 +0300
commit064f6db3b8f8534e9aaaf881168017bac5fcb6cf (patch)
tree2a5d65ace231e95a40fef942201d818327807881 /plugins
parent914d48f4f6817175404f27414eaf1158c7123ac7 (diff)
Fix possible notices / code improvements (#19561)
* Improve reading possibly undefined config value * Improve reading possibly undefined config value * remove another error suppression
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Actions/DataTable/Filter/Actions.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/plugins/Actions/DataTable/Filter/Actions.php b/plugins/Actions/DataTable/Filter/Actions.php
index fe0130b276..c2196bae27 100644
--- a/plugins/Actions/DataTable/Filter/Actions.php
+++ b/plugins/Actions/DataTable/Filter/Actions.php
@@ -1,4 +1,5 @@
<?php
+
/**
* Matomo - free/libre analytics platform
*
@@ -6,10 +7,11 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
+
namespace Piwik\Plugins\Actions\DataTable\Filter;
use Piwik\Common;
-use Piwik\Config;
+use Piwik\Config\GeneralConfig;
use Piwik\DataTable\BaseFilter;
use Piwik\DataTable;
use Piwik\Plugins\Actions\ArchivingHelper;
@@ -41,17 +43,17 @@ class Actions extends BaseFilter
$site = $dataTable->getMetadata('site');
$urlPrefix = $site ? $site->getMainUrl() : null;
- $defaultActionName = Config::getInstance()->General['action_default_name'];
+ $defaultActionName = GeneralConfig::getConfigValue('action_default_name');
$isPageTitleType = $this->actionType == Action::TYPE_PAGE_TITLE;
// for BC, we read the old style delimiter first (see #1067)
- $actionDelimiter = @Config::getInstance()->General['action_category_delimiter'];
+ $actionDelimiter = GeneralConfig::getConfigValue('action_category_delimiter');
if (empty($actionDelimiter)) {
if ($isPageTitleType) {
- $actionDelimiter = Config::getInstance()->General['action_title_category_delimiter'];
+ $actionDelimiter = GeneralConfig::getConfigValue('action_title_category_delimiter');
} else {
- $actionDelimiter = Config::getInstance()->General['action_url_category_delimiter'];
+ $actionDelimiter = GeneralConfig::getConfigValue('action_url_category_delimiter');
}
}