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

Merge pull request #540 from dhensby/pulls/2.4/fix-multibyte-urlfilter 

FIX Make sure `setAllowMultibyte` is on when looking up by URLSegment
This commit is contained in:
Robbie Averill 2018-06-20 08:24:01 +12:00 committed by GitHub
parent 767250435e 3b14436304
commit a4efb3409c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/model/Blog.php
View File

@ -709,6 +709,7 @@ class Blog_Controller extends Page_Controller
if ($urlSegment) {
$filter = URLSegmentFilter::create();
$filter->setAllowMultibyte(true);
return Member::get()
->filter('URLSegment', $filter->filter($urlSegment))

8
tests/Widgets/BlogArchiveWidgetTest.php
View File

@ -53,7 +53,9 @@ class BlogArchiveWidgetTest extends SapphireTest
array('Title' => 'August 2017'),
), $archive);
Versioned::reading_stage($original);
if ($original) {
Versioned::reading_stage($original);
}
}
public function testArchiveYearly()
@ -91,6 +93,8 @@ class BlogArchiveWidgetTest extends SapphireTest
$this->assertCount(4, $archive, 'Four months are shown in the blog archive list after new post added');
Versioned::reading_stage($original);
if ($original) {
Versioned::reading_stage($original);
}
}
}