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:
authorThomas Steur <tsteur@users.noreply.github.com>2019-09-13 12:27:21 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2019-09-13 12:27:21 +0300
commiteb135d879a64ecbd33554dd51b5788f8065e037d (patch)
treebb882a979d8de52a7294ea95f318fadef97c617d /plugins/CoreAdminHome
parent703ed9402e4aada544ec94e789021df86575ad15 (diff)
Various platform tweaks (#14832)
* platform tweaks * prevent failing if loaded twice * Update Config.php * Update PluginList.php * Update Config.php * Update IniFileChain.php * Update Config.php * Update Config.php * allow configure different path for custom logo * only show install plugin button when activated * allow disable users and sites management * do not allow calling set super user access * Update PluginList.php * Update Config.php * Update global.ini.php * Update Config.php * Update global.ini.php
Diffstat (limited to 'plugins/CoreAdminHome')
-rw-r--r--plugins/CoreAdminHome/CustomLogo.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php
index ba2ce811d9..1c1368a1f5 100644
--- a/plugins/CoreAdminHome/CustomLogo.php
+++ b/plugins/CoreAdminHome/CustomLogo.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\CoreAdminHome;
use Piwik\Config;
+use Piwik\Container\StaticContainer;
use Piwik\Filesystem;
use Piwik\Option;
use Piwik\Piwik;
@@ -136,22 +137,22 @@ class CustomLogo
public static function getPathUserLogo()
{
- return static::rewritePath('misc/user/logo.png');
+ return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo.png');
}
public static function getPathUserFavicon()
{
- return static::rewritePath('misc/user/favicon.png');
+ return static::rewritePath(StaticContainer::get('path.misc.user') . 'favicon.png');
}
public static function getPathUserSvgLogo()
{
- return static::rewritePath('misc/user/logo.svg');
+ return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo.svg');
}
public static function getPathUserLogoSmall()
{
- return static::rewritePath('misc/user/logo-header.png');
+ return static::rewritePath(StaticContainer::get('path.misc.user') . 'logo-header.png');
}
protected static function rewritePath($path)
@@ -288,3 +289,4 @@ class CustomLogo
}
}
+