tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.1' into 4.2

This commit is contained in:
Robbie Averill 2019-02-06 22:24:32 +03:00
parent 53374d617e 668670b5a1
commit 976bbc1014
4 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/Controllers/ContentController.php
View File

@ -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();
}

9
code/Controllers/ModelAsController.php
View File

@ -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);
}

2
code/Model/SiteTree.php
View File

@ -1921,7 +1921,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);

34
tests/php/Controllers/ModelAsControllerTest.php
View File

@ -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'
);
}
}