From b00a6254df1f769441c53d7f53be55844fb0f1c9 Mon Sep 17 00:00:00 2001 From: mattab Date: Fri, 28 Nov 2014 21:09:48 +1300 Subject: refs #6552 don't add rel=nofollow on links going through the proxy as the referrer is checked ;) --- core/Error.php | 2 +- core/Updates/0.6-rc1.php | 4 ++-- core/Updates/1.2-rc1.php | 2 +- plugins/API/templates/listAllAPI.twig | 2 +- .../CoreAdminHome/templates/generalSettings.twig | 8 ++++---- plugins/CoreHome/templates/_headerMessage.twig | 2 +- .../CorePluginsAdmin/templates/browsePlugins.twig | 2 +- plugins/CoreUpdater/templates/oneClickResults.twig | 2 +- .../templates/runUpdaterAndExit_done.twig | 2 +- .../templates/runUpdaterAndExit_welcome.twig | 4 ++-- plugins/DBStats/templates/index.twig | 2 +- plugins/ExampleRssWidget/RssRenderer.php | 2 +- plugins/Feedback/templates/index.twig | 24 +++++++++++----------- plugins/Goals/templates/_addEditGoal.twig | 4 ++-- plugins/Goals/templates/_formAddGoal.twig | 2 +- plugins/Goals/templates/addNewGoal.twig | 2 +- plugins/Installation/templates/systemCheck.twig | 2 +- plugins/Login/Controller.php | 2 +- plugins/MobileMessaging/SMSProvider.php | 6 +++--- plugins/SEO/templates/getRank.twig | 2 +- tests/PHPUnit/Integration/LogTest.php | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/core/Error.php b/core/Error.php index d8fa0706fc..c56e3301a7 100644 --- a/core/Error.php +++ b/core/Error.php @@ -148,7 +148,7 @@ class Error $htmlString = ''; $htmlString .= "\n
There is an error. Please report the message (Piwik " . (class_exists('Piwik\Version') ? Version::VERSION : '') . ") - and full backtrace in the Piwik forums (please do a Search first as it might have been reported already!).

+ and full backtrace in the Piwik forums (please do a Search first as it might have been reported already!).

"; $htmlString .= Error::getErrNoString($message->errno); $htmlString .= ": {$message->errstr} in {$message->errfile}"; diff --git a/core/Updates/0.6-rc1.php b/core/Updates/0.6-rc1.php index 9a946251ad..9f293dda97 100644 --- a/core/Updates/0.6-rc1.php +++ b/core/Updates/0.6-rc1.php @@ -42,8 +42,8 @@ class Updates_0_6_rc1 extends Updates { // first we disable the plugins and keep an array of warnings messages $pluginsToDisableMessage = array( - 'SearchEnginePosition' => "SearchEnginePosition plugin was disabled, because it is not compatible with the new Piwik 0.6. \n You can download the latest version of the plugin, compatible with Piwik 0.6.\nClick here.", - 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 0.6. \nYou can download the latest version of the plugin, compatible with Piwik 0.6.\nClick here." + 'SearchEnginePosition' => "SearchEnginePosition plugin was disabled, because it is not compatible with the new Piwik 0.6. \n You can download the latest version of the plugin, compatible with Piwik 0.6.\nClick here.", + 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 0.6. \nYou can download the latest version of the plugin, compatible with Piwik 0.6.\nClick here." ); $disabledPlugins = array(); foreach ($pluginsToDisableMessage as $pluginToDisable => $warningMessage) { diff --git a/core/Updates/1.2-rc1.php b/core/Updates/1.2-rc1.php index 658dffeb27..e268ad8570 100644 --- a/core/Updates/1.2-rc1.php +++ b/core/Updates/1.2-rc1.php @@ -129,7 +129,7 @@ class Updates_1_2_rc1 extends Updates { // first we disable the plugins and keep an array of warnings messages $pluginsToDisableMessage = array( - 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 1.2. \nYou can download the latest version of the plugin, compatible with Piwik 1.2.\nClick here.", + 'GeoIP' => "GeoIP plugin was disabled, because it is not compatible with the new Piwik 1.2. \nYou can download the latest version of the plugin, compatible with Piwik 1.2.\nClick here.", 'EntryPage' => "EntryPage plugin is not compatible with this version of Piwik, it was disabled.", ); $disabledPlugins = array(); diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 6ccd5db38f..e4cf96174c 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -16,7 +16,7 @@

{{ 'API_PluginDescription'|translate }}

- {{ 'API_MoreInformation'|translate("","","","")|raw }} + {{ 'API_MoreInformation'|translate("","","","")|raw }}

{{ 'API_UserAuthentication'|translate }}

diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index d7f49b07e9..5ee3f91389 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -24,13 +24,13 @@
- {{ 'General_ArchivingTriggerDescription'|translate("","")|raw }} + {{ 'General_ArchivingTriggerDescription'|translate("","")|raw }} {% set browserArchivingHelp %} {{ 'General_ArchivingInlineHelp'|translate }}
- {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("","")|raw }} + {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("","")|raw }} {% endset %} {{ piwik.inlineHelp(browserArchivingHelp) }} @@ -100,9 +100,9 @@ {% set checkReleaseHelp %} - {{ 'CoreAdminHome_DevelopmentProcess'|translate("","")|raw }} + {{ 'CoreAdminHome_DevelopmentProcess'|translate("","")|raw }}
- {{ 'CoreAdminHome_StableReleases'|translate("","")|raw }} + {{ 'CoreAdminHome_StableReleases'|translate("","")|raw }} {% endset %} {{ piwik.inlineHelp(checkReleaseHelp) }} diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 0d13585f1a..d3ae43a271 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -36,7 +36,7 @@ {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }} {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %} {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("Piwik " ~ latest_version_available ~ "", "", "")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("Piwik " ~ latest_version_available ~ "", "", "")|raw }} {% elseif isSuperUser and adminMenu is defined and adminMenu %} {{ updateCheck|raw }}
diff --git a/plugins/CorePluginsAdmin/templates/browsePlugins.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig index 2624dd00e9..9259081a0c 100644 --- a/plugins/CorePluginsAdmin/templates/browsePlugins.twig +++ b/plugins/CorePluginsAdmin/templates/browsePlugins.twig @@ -55,6 +55,6 @@ {% set marketplaceSellPluginSubject = 'CorePluginsAdmin_MarketplaceSellPluginSubject'|translate %} {{ 'CorePluginsAdmin_GetEarlyAccessForPaidPlugins'|translate("", "")|raw }}
- {{ 'CorePluginsAdmin_DevelopersLearnHowToDevelopPlugins'|translate('', '')|raw }} + {{ 'CorePluginsAdmin_DevelopersLearnHowToDevelopPlugins'|translate('', '')|raw }}
{% endblock %} diff --git a/plugins/CoreUpdater/templates/oneClickResults.twig b/plugins/CoreUpdater/templates/oneClickResults.twig index 7696e724ae..555e1ef568 100644 --- a/plugins/CoreUpdater/templates/oneClickResults.twig +++ b/plugins/CoreUpdater/templates/oneClickResults.twig @@ -14,7 +14,7 @@
- {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("

","","")|raw }} + {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("

","","")|raw }}


diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 8ddf66876d..ceb7f44e53 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -1,6 +1,6 @@ {% extends '@CoreUpdater/layout.twig' %} {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('','','
  • ')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('','','
  • ')|raw }} {% endset %} {% block content %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index c468beb3db..b6318e5c6a 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -4,7 +4,7 @@ {% spaceless %} {{ postEvent('Template.topBar')|raw }} {% set helpMessage %} - {{ 'CoreUpdater_HelpMessageContent'|translate('','','
  • ')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('','','
  • ')|raw }} {% endset %} {% if coreError %} @@ -49,7 +49,7 @@ {% endif %}

    {{ 'Feedback_PrivacyClaim'|translate( - "", + "", "" )|raw}}

    diff --git a/plugins/Goals/templates/_addEditGoal.twig b/plugins/Goals/templates/_addEditGoal.twig index f7373b6b8e..167dbba7b0 100644 --- a/plugins/Goals/templates/_addEditGoal.twig +++ b/plugins/Goals/templates/_addEditGoal.twig @@ -4,7 +4,7 @@

    {{ 'Goals_NewGoalDescription'|translate }} {{ 'Goals_NewWhatDoYouWantUsersToDo'|translate }} {{ 'Goals_NewGoalYouWillBeAbleTo'|translate }}

    -

    {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("","")|raw }} +

    {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("","")|raw }}

    {% else %}
    @@ -13,7 +13,7 @@