mirror of
https://github.com/silverstripe/silverstripe-blog
synced 2024-10-22 11:05:58 +02:00
Merge branch '2.4' into 2.5
This commit is contained in:
commit
2da2c2927f
@ -709,6 +709,7 @@ class Blog_Controller extends Page_Controller
|
|||||||
|
|
||||||
if ($urlSegment) {
|
if ($urlSegment) {
|
||||||
$filter = URLSegmentFilter::create();
|
$filter = URLSegmentFilter::create();
|
||||||
|
$filter->setAllowMultibyte(true);
|
||||||
|
|
||||||
return Member::get()
|
return Member::get()
|
||||||
->filter('URLSegment', $filter->filter($urlSegment))
|
->filter('URLSegment', $filter->filter($urlSegment))
|
||||||
|
@ -53,8 +53,10 @@ class BlogArchiveWidgetTest extends SapphireTest
|
|||||||
array('Title' => 'August 2017'),
|
array('Title' => 'August 2017'),
|
||||||
), $archive);
|
), $archive);
|
||||||
|
|
||||||
|
if ($original) {
|
||||||
Versioned::reading_stage($original);
|
Versioned::reading_stage($original);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public function testArchiveYearly()
|
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');
|
$this->assertCount(4, $archive, 'Four months are shown in the blog archive list after new post added');
|
||||||
|
|
||||||
|
if ($original) {
|
||||||
Versioned::reading_stage($original);
|
Versioned::reading_stage($original);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user