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

Merge branch '2.4' into 2.5

This commit is contained in:
Daniel Hensby 2018-06-19 21:40:41 +01:00
parent c76cbcb0f0 a4efb3409c
commit 2da2c2927f
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
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);
}
}
}