Prevent query strings breaking findByUrl ...

Closes #2207
Closes #2230

Author: jasonvarga

src/Sites/Sites.php

@@ -37,6 +37,7 @@ public function get($handle)
 
     public function findByUrl($url)
     {
+        $url = Str::before($url, '?');
         $url = Str::ensureRight($url, '/');
 
         return collect($this->sites)->filter(function ($site) use ($url) {

tests/Sites/SitesTest.php

@@ -122,6 +122,11 @@ public function gets_site_from_url()
         // https://github.com/statamic/cms/issues/1874
         $this->assertEquals('en', $this->sites->findByUrl('http://test.com/delightful')->handle());
         $this->assertEquals('de', $this->sites->findByUrl('http://test.com/de')->handle());
+
+        // Make sure that urls that have a query string don't get misinterpreted.
+        // https://github.com/statamic/cms/issues/2207
+        $this->assertEquals('en', $this->sites->findByUrl('http://test.com?foo=bar')->handle());
+        $this->assertEquals('de', $this->sites->findByUrl('http://test.com/de?foo=bar')->handle());
     }
 
     /** @test */