From d392ca72f19e607f69973f635b559229c61d337a Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 19 Jun 2018 14:23:27 +0100 Subject: [PATCH 1/2] FIX Make sure `setAllowMultibyte` is on when looking up by URLSegment --- code/model/Blog.php | 1 + 1 file changed, 1 insertion(+) diff --git a/code/model/Blog.php b/code/model/Blog.php index a05477e..9248ce3 100644 --- a/code/model/Blog.php +++ b/code/model/Blog.php @@ -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)) From 3b14436304a63efe2ec607f9048f022f083f24b6 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 19 Jun 2018 14:39:17 +0100 Subject: [PATCH 2/2] TEST Fix regression in tests from new Versioned exceptions --- tests/Widgets/BlogArchiveWidgetTest.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/Widgets/BlogArchiveWidgetTest.php b/tests/Widgets/BlogArchiveWidgetTest.php index 6bba2a9..5cdf7e4 100644 --- a/tests/Widgets/BlogArchiveWidgetTest.php +++ b/tests/Widgets/BlogArchiveWidgetTest.php @@ -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); + } } }