Merge branch '4.3' into 4

code/Controllers/ContentController.php

@@ -25,6 +25,7 @@ use SilverStripe\Security\Security;
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\ArrayData;
+use SilverStripe\View\Parsers\URLSegmentFilter;
 use SilverStripe\View\Requirements;
 use SilverStripe\View\SSViewer;
 use Translatable;
@@ -195,11 +196,16 @@ class ContentController extends Controller
             if (class_exists('Translatable')) {
                 Translatable::disable_locale_filter();
             }
+
+            $filter = URLSegmentFilter::create();
+
             // look for a page with this URLSegment
             $child = SiteTree::get()->filter([
                 'ParentID' => $this->ID,
-                'URLSegment' => rawurlencode($action),
+                // url encode unless it's multibyte (already pre-encoded in the database)
+                'URLSegment' => $filter->getAllowMultibyte() ? $action : rawurlencode($action),
             ])->first();
+
             if (class_exists('Translatable')) {
                 Translatable::enable_locale_filter();
             }

code/Controllers/ModelAsController.php

@@ -16,6 +16,7 @@ use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\Debug;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
+use SilverStripe\View\Parsers\URLSegmentFilter;
 use Translatable;
 
 /**
@@ -127,8 +128,14 @@ class ModelAsController extends Controller implements NestedController
             Translatable::disable_locale_filter();
         }
 
+        // url encode unless it's multibyte (already pre-encoded in the database)
+        $filter = URLSegmentFilter::create();
+        if (!$filter->getAllowMultibyte()) {
+            $URLSegment = rawurlencode($URLSegment);
+        }
+
         // Select child page
-        $conditions = array('"SiteTree"."URLSegment"' => rawurlencode($URLSegment));
+        $conditions = array('"SiteTree"."URLSegment"' => $URLSegment);
         if (SiteTree::config()->get('nested_urls')) {
             $conditions[] = array('"SiteTree"."ParentID"' => 0);
         }

code/Model/SiteTree.php

@@ -63,6 +63,7 @@ use SilverStripe\Security\PermissionChecker;
 use SilverStripe\Security\PermissionProvider;
 use SilverStripe\Security\Security;
 use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\Subsites\Model\Subsite;
 use SilverStripe\Versioned\RecursivePublishable;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\ArrayData;
@@ -70,7 +71,6 @@ use SilverStripe\View\HTML;
 use SilverStripe\View\Parsers\ShortcodeParser;
 use SilverStripe\View\Parsers\URLSegmentFilter;
 use SilverStripe\View\SSViewer;
-use Subsite;
 
 /**
  * Basic data-object representing all pages within the site tree. All page types that live within the hierarchy should
@@ -1829,7 +1829,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
      */
     public function DependentPages($includeVirtuals = true)
     {
-        if (class_exists('Subsite')) {
+        if (class_exists(Subsite::class)) {
             $origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
             Subsite::disable_subsite_filter(true);
         }
@@ -1865,7 +1865,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
             });
         $items->merge($redirectors);
 
-        if (class_exists('Subsite')) {
+        if (class_exists(Subsite::class)) {
             Subsite::disable_subsite_filter($origDisableSubsiteFilter);
         }
 
@@ -1884,9 +1884,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
         // Disable subsite filter for these pages
         if ($pages instanceof DataList) {
             return $pages->setDataQueryParam('Subsite.filter', false);
-        } else {
-            return $pages;
         }
+        return $pages;
     }
 
     /**
@@ -1954,8 +1953,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
                 'Title' => $this->fieldLabel('Title'),
                 'DependentLinkType' => _t(__CLASS__.'.DependtPageColumnLinkType', 'Link type'),
             );
-            if (class_exists('Subsite')) {
-                $dependentColumns['Subsite.Title'] = singleton('Subsite')->i18n_singular_name();
+            if (class_exists(Subsite::class)) {
+                $dependentColumns['Subsite.Title'] = Subsite::singleton()->i18n_singular_name();
             }
 
             $dependentNote = new LiteralField('DependentNote', '<p>' . _t(__CLASS__.'.DEPENDENT_NOTE', 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.') . '</p>');
@@ -1995,7 +1994,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
         $helpText = (self::config()->get('nested_urls') && $this->numChildren())
             ? $this->fieldLabel('LinkChangeNote')
             : '';
-        if (!Config::inst()->get('SilverStripe\\View\\Parsers\\URLSegmentFilter', 'default_allow_multibyte')) {
+        if (!URLSegmentFilter::create()->getAllowMultibyte()) {
             $helpText .= _t('SilverStripe\\CMS\\Forms\\SiteTreeURLSegmentField.HelpChars', ' Special characters are automatically converted or removed.');
         }
         $urlsegment->setHelpText($helpText);

tests/php/Controllers/ModelAsControllerTest.php

@@ -11,6 +11,7 @@ use SilverStripe\Control\Director;
 use SilverStripe\Control\Controller;
 use SilverStripe\Dev\FunctionalTest;
 use Page;
+use SilverStripe\View\Parsers\URLSegmentFilter;
 
 class ModelAsControllerTest extends FunctionalTest
 {
@@ -321,4 +322,37 @@ class ModelAsControllerTest extends FunctionalTest
             'The page should not be found since its parent has not been published, in this case http://<yousitename>/root/sub-root or http://<yousitename>/sub-root'
         );
     }
+
+    public function testAllowMultibyte()
+    {
+        Config::modify()->set(URLSegmentFilter::class, 'default_allow_multibyte', true);
+
+        $parent = new Page();
+        $parent->Title = 'Multibyte test';
+        $parent->URLSegment = 'بلاگ';
+        $parent->write();
+        $parent->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+
+        $child = new Page();
+        $child->Title = 'Multibyte test';
+        $child->URLSegment = 'فضة';
+        $child->ParentID = $parent->ID;
+        $child->write();
+        $child->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE);
+
+        // Emulate browser behaviour around multibyte URL encodings
+        $response = $this->get(rawurlencode('بلاگ'));
+        $this->assertEquals(
+            $response->getStatusCode(),
+            200,
+            'Routes toplevel paths'
+        );
+
+        $response = $this->get(join('/', [rawurlencode('بلاگ'), rawurlencode('فضة')]));
+        $this->assertEquals(
+            $response->getStatusCode(),
+            200,
+            'Routes nested paths'
+        );
+    }
 }

tests/php/Model/SiteTreePermissionsTest.php

@@ -10,6 +10,7 @@ use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
 use SilverStripe\Versioned\Versioned;
 
 /**
@@ -20,11 +21,11 @@ class SiteTreePermissionsTest extends FunctionalTest
 {
     protected static $fixture_file = "SiteTreePermissionsTest.yml";
 
-    protected static $illegal_extensions = array(
-        SiteTree::class => array('SiteTreeSubsites')
-    );
+    protected static $illegal_extensions = [
+        SiteTree::class => [SiteTreeSubsites::class],
+    ];
 
-    public function setUp()
+    protected function setUp()
     {
         parent::setUp();