From 6442f147ad3b281d799448a063a5e388b758dbfa Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 16 Dec 2016 10:12:00 +1300
Subject: Clarify where to put the JS code

---
 plugins/SitesManager/templates/_displayJavascriptCode.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/SitesManager')

diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index c80d286609..b5c4671c7e 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -3,7 +3,7 @@
 <div class='trackingHelp'>
     <p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
 
-    <p>{{ 'CoreAdminHome_JSTrackingIntro3'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+    <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
 
     <h3>{{ 'General_JsTrackingTag'|translate }}</h3>
 
-- 
cgit v1.2.3


From a2c17ae6f6dfd579c94ee59d7f0c316d2e8f82c2 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@piwik.org>
Date: Fri, 16 Dec 2016 01:18:04 +0100
Subject: Store site search settings correctly (#11022)

* store site search settings correctly

* Updated instruction for JS code in https://github.com/piwik/piwik/pull/11011 https://github.com/piwik/piwik/issues/11007

* improve check if default keywords are used

* Tests
---
 .../expected/test_SitesManager__SitesManager.getSiteSettings.xml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/SitesManager')

diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
index 3fafd8604e..731b90d265 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -145,8 +145,8 @@
 			<row>
 				<name>use_default_site_search_params</name>
 				<title>Use &lt;a href='#globalSettings'&gt;default&lt;/a&gt; Site Search parameters</title>
-				<value>0</value>
-				<defaultValue>0</defaultValue>
+				<value>1</value>
+				<defaultValue>1</defaultValue>
 				<type>boolean</type>
 				<uiControl>checkbox</uiControl>
 				<uiControlAttributes>
-- 
cgit v1.2.3