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:
Guy Marriott 2019-08-01 11:21:57 +12:00
parent f6873d084a 3ed161744b
commit ae4c2ffd4c
No known key found for this signature in database
GPG Key ID: A80F9ACCB86D3DA7
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/extensions/BlogMemberExtension.php
View File

@ -57,6 +57,8 @@ class BlogMemberExtension extends DataExtension
public function generateURLSegment() public function generateURLSegment()
{ {
$filter = URLSegmentFilter::create(); $filter = URLSegmentFilter::create();
$filter->setAllowMultibyte(true);
$name = $this->owner->FirstName . ' ' . $this->owner->Surname; $name = $this->owner->FirstName . ' ' . $this->owner->Surname;
$urlSegment = $filter->filter($name); $urlSegment = $filter->filter($name);

2
code/model/Blog.php
View File

@ -863,6 +863,7 @@ class Blog_Controller extends Page_Controller
$tag = $this->request->param('Tag'); $tag = $this->request->param('Tag');
if ($tag) { if ($tag) {
$filter = URLSegmentFilter::create(); $filter = URLSegmentFilter::create();
$filter->setAllowMultibyte(true);
return $dataRecord->Tags() return $dataRecord->Tags()
->filter('URLSegment', array($tag, $filter->filter($tag))) ->filter('URLSegment', array($tag, $filter->filter($tag)))
@ -909,6 +910,7 @@ class Blog_Controller extends Page_Controller
$category = $this->request->param('Category'); $category = $this->request->param('Category');
if ($category) { if ($category) {
$filter = URLSegmentFilter::create(); $filter = URLSegmentFilter::create();
$filter->setAllowMultibyte(true);
return $dataRecord->Categories() return $dataRecord->Categories()
->filter('URLSegment', array($category, $filter->filter($category))) ->filter('URLSegment', array($category, $filter->filter($category)))