Merge pull request #402 from micmania1/fix-376-url

FIX #376 allow multibyte chars in url segment
silverstripe · Jun 29, 2016 · a21b503 · a21b503
2 parents 35c5357 + e4c3b87
commit a21b503
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/code/extensions/URLSegmentExtension.php b/code/extensions/URLSegmentExtension.php
@@ -36,6 +36,12 @@ public function generateURLSegment($increment = null)
     {
         $filter = new URLSegmentFilter();
 
+        // Setting this to on. Because of the UI flow, it would be quite a lot of work
+        // to support turning this off. (ie. the add by title flow would not work).
+        // If this becomes a problem we can approach it then.
+        // @see https://github.com/silverstripe/silverstripe-blog/issues/376
+        $filter->setAllowMultibyte(true);
+
         $this->owner->URLSegment = $filter->filter($this->owner->Title);
 
         if (is_int($increment)) {

diff --git a/tests/BlogCategoryTest.php b/tests/BlogCategoryTest.php
@@ -52,6 +52,22 @@ public function testBlogPosts()
         $this->assertEquals(5, $category->BlogPosts()->count(), 'Category blog post count');
     }
 
+    /**
+     * @see https://github.com/silverstripe/silverstripe-blog/issues/376
+     */
+    public function testAllowMultibyteUrlSegment()
+    {
+        $blog = $this->objFromFixture('Blog', 'FirstBlog');
+        $cat = new BlogCategory();
+        $cat->BlogID = $blog->ID;
+        $cat->Title = 'تست';
+        $cat->write();
+        // urlencoded
+        $this->assertEquals('%D8%AA%D8%B3%D8%AA', $cat->URLSegment);
+        $link = Controller::join_links($cat->Blog()->Link(), 'category', '%D8%AA%D8%B3%D8%AA');
+        $this->assertEquals($link, $cat->getLink());
+    }
+
     public function testCanView()
     {
         $this->useDraftSite();

diff --git a/tests/BlogTagTest.php b/tests/BlogTagTest.php
@@ -52,6 +52,22 @@ public function testBlogPosts()
         $this->assertEquals(1, $tag->BlogPosts()->count(), 'Tag blog post count');
     }
 
+    /**
+     * @see https://github.com/silverstripe/silverstripe-blog/issues/376
+     */
+    public function testAllowMultibyteUrlSegment()
+    {
+        $blog = $this->objFromFixture('Blog', 'FirstBlog');
+        $tag = new BlogTag();
+        $tag->BlogID = $blog->ID;
+        $tag->Title = 'تست';
+        $tag->write();
+        // urlencoded
+        $this->assertEquals('%D8%AA%D8%B3%D8%AA', $tag->URLSegment);
+        $link = Controller::join_links($tag->Blog()->Link(), 'tag', '%D8%AA%D8%B3%D8%AA');
+        $this->assertEquals($link, $tag->getLink());
+    }
+
     /**
      * The first blog can be viewed by anybody.
      */