Merge branch 'master' into 3.0-m06

Conflicts:
	.travis.yml
	bower.json
	core/Notification/Manager.php
	core/Updates.php
	core/Updates/2.16.2-b2.php
	core/Version.php
	libs/Zend/Validate/Hostname.php
	libs/bower_components/jScrollPane/ajax.html
	libs/bower_components/jScrollPane/anchors.html
	libs/bower_components/jScrollPane/api.html
	libs/bower_components/jScrollPane/arrow_hover.html
	libs/bower_components/jScrollPane/arrow_positions.html
	libs/bower_components/jScrollPane/arrows.html
	libs/bower_components/jScrollPane/auto_reinitialise.html
	libs/bower_components/jScrollPane/basic.html
	libs/bower_components/jScrollPane/caps.html
	libs/bower_components/jScrollPane/changelog.html
	libs/bower_components/jScrollPane/destroy.html
	libs/bower_components/jScrollPane/drag_size.html
	libs/bower_components/jScrollPane/dynamic_content.html
	libs/bower_components/jScrollPane/dynamic_height.html
	libs/bower_components/jScrollPane/dynamic_width.html
	libs/bower_components/jScrollPane/events.html
	libs/bower_components/jScrollPane/faqs.html
	libs/bower_components/jScrollPane/fixed_width.html
	libs/bower_components/jScrollPane/focus.html
	libs/bower_components/jScrollPane/fullpage_scroll.html
	libs/bower_components/jScrollPane/iframe.html
	libs/bower_components/jScrollPane/iframe2.html
	libs/bower_components/jScrollPane/iframe_content1.html
	libs/bower_components/jScrollPane/iframe_content2.html
	libs/bower_components/jScrollPane/image.html
	libs/bower_components/jScrollPane/image2.html
	libs/bower_components/jScrollPane/index.html
	libs/bower_components/jScrollPane/invisibles.html
	libs/bower_components/jScrollPane/known_issues.html
	libs/bower_components/jScrollPane/less_basic.html
	libs/bower_components/jScrollPane/mwheel_intent.html
	libs/bower_components/jScrollPane/override_animate.html
	libs/bower_components/jScrollPane/runeimp.html
	libs/bower_components/jScrollPane/runeimp2.html
	libs/bower_components/jScrollPane/scroll_on_left.html
	libs/bower_components/jScrollPane/scroll_to.html
	libs/bower_components/jScrollPane/scroll_to_animate.html
	libs/bower_components/jScrollPane/settings.html
	libs/bower_components/jScrollPane/short.html
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/swap.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/accepts.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/wrap.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/javascripts/manifest.json
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js

4 files changed, 19 insertions, 4 deletions

diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
index f5ff10e11c..1e7e4af8cb 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerKeywordTest.php
@@ -38,7 +38,7 @@ class ReferrerKeywordTest extends IntegrationTestCase
         $ecommerce = false;
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
 
         $this->keyword = new Keyword();
     }
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
index f118e14ba6..cd1610a178 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
@@ -44,7 +44,7 @@ class ReferrerNameTest extends IntegrationTestCase
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/foo/bar');
         Fixture::createWebsite($date, $ecommerce, $name = 'test2', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
 
         $this->referrerName = new ReferrerName();
     }
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
index 5925dbc5c0..63da107af5 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerTypeTest.php
@@ -32,6 +32,7 @@ class ReferrerTypeTest extends IntegrationTestCase
     private $idSite1 = 1;
     private $idSite2 = 2;
     private $idSite3 = 3;
+    private $idSite4 = 4;
 
     public function setUp()
     {
@@ -44,7 +45,8 @@ class ReferrerTypeTest extends IntegrationTestCase
 
         Fixture::createWebsite($date, $ecommerce, $name = 'test1', $url = 'http://piwik.org/foo/bar');
         Fixture::createWebsite($date, $ecommerce, $name = 'test2', $url = 'http://piwik.org/');
-        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.pro/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test3', $url = 'http://piwik.xyz/');
+        Fixture::createWebsite($date, $ecommerce, $name = 'test4', $url = 'http://google.com/subdir/', 1, null, null, null, null, $excludeUnknownUrls = 1);
 
         $this->referrerType = new ReferrerType();
     }
@@ -112,6 +114,19 @@ class ReferrerTypeTest extends IntegrationTestCase
 
             // testing case where domain of referrer is not known to any site but neither is the URL, url != urlref
             array(Common::REFERRER_TYPE_WEBSITE,      $this->idSite3, 'http://example.org', 'http://example.com/bar'),
+
+            ####### testing specific case:
+            ## - ignore unknown urls is activated for idSite4
+
+            // referrer comes from another subdir, but same host   => external website
+            array(Common::REFERRER_TYPE_WEBSITE,      $this->idSite4, 'http://google.com/subdir/site', 'http://google.com/base'),
+            // referrer comes from same subdir and host   => direct entry
+            array(Common::REFERRER_TYPE_DIRECT_ENTRY, $this->idSite4, 'http://google.com/subdir/page', 'http://google.com/subdir/x'),
+            array(Common::REFERRER_TYPE_DIRECT_ENTRY, $this->idSite4, 'http://google.com/subdir/', 'http://google.com/subdir/?q=test'),
+            // referrer comes from another subdir, but same host, query matches search engine definition  => search engine
+            array(Common::REFERRER_TYPE_SEARCH_ENGINE, $this->idSite4, 'http://google.com/subdir/index.html', 'http://google.com/search?q=test'),
+            // referrer comes from search engine not matching site
+            array(Common::REFERRER_TYPE_SEARCH_ENGINE, $this->idSite4, 'http://google.com/subdir/index.html', 'http://google.fr/search?q=test')
         );
     }
 
diff --git a/plugins/Referrers/tests/Unit/SearchEngineTest.php b/plugins/Referrers/tests/Unit/SearchEngineTest.php
index e9f0c926ea..1b5cab4dbc 100644
--- a/plugins/Referrers/tests/Unit/SearchEngineTest.php
+++ b/plugins/Referrers/tests/Unit/SearchEngineTest.php
@@ -121,7 +121,7 @@ class SearchEngineTest extends \PHPUnit_Framework_TestCase
     public function testMissingSearchEngineKeyword($url, $searchEngine)
     {
         $name = parse_url('http://' . $url);
-        $this->assertTrue(!empty($searchEngine['params']), $name['host']);
+        $this->assertTrue(!empty($searchEngine['params']) || !empty($searchEngine['hiddenkeyword']), $name['host']);
     }
 
     /**