diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-01-10 21:45:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-10 21:45:20 +0300 |
commit | 82a9b1b0a01dc20928d50134233e167f0116472d (patch) | |
tree | a85fb5ecde6e9b9bacdd20f4310919daf674ab59 /plugins/Login | |
parent | 92cb21b63c7b971579a9f0e3da57cc7d425a3c4f (diff) |
Further Piwik.org => Matomo.org replacements (#12415)
* renaming more Piwik mentions
* some more updates
* fix some tests
* support matomo partially as require string
* fix tests
* fix failing system test
* fix tests
* fix system test
* fix test
Diffstat (limited to 'plugins/Login')
-rw-r--r-- | plugins/Login/Controller.php | 4 | ||||
-rw-r--r-- | plugins/Login/templates/login.twig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index a32eeb5e9a..50545fc719 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -215,7 +215,7 @@ class Controller extends \Piwik\Plugin\Controller protected function getMessageExceptionNoAccess() { - $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); + $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://matomo.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); $message .= $this->getMessageExceptionNoAccessWhenInsecureConnectionMayBeUsed(); @@ -234,7 +234,7 @@ class Controller extends \Piwik\Plugin\Controller if(Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) { $message = '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured', array( - '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://piwik.org/faq/how-to/faq_91/">') . '">', + '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://matomo.org/faq/how-to/faq_91/">') . '">', '</a>', 'config/config.ini.php', '<pre>force_ssl=1</pre>', diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index c7375b773e..638328515e 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -30,7 +30,7 @@ <span id="logo" class="brand-logo center"> {% if isCustomLogo == false %} - <a href="https://piwik.org" title="{{ linkTitle }}"> + <a href="https://matomo.org" title="{{ linkTitle }}"> {% endif %} {% if hasSVGLogo %} <img src='{{ logoSVG }}' class="{% if not isCustomLogo %}default-piwik-logo{% endif %}" title="{{ linkTitle }}" alt="Piwik"/> @@ -114,7 +114,7 @@ {% if isCustomLogo %} <p id="piwik"> - <i><a href="https://piwik.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i> + <i><a href="https://matomo.org/" rel="noreferrer" target="_blank">{{ linkTitle }}</a></i> </p> {% endif %} |