Merge pull request #767 from core23/revert/PR#646

Revert: Use the page name if the page has no SEO title (#646)
sonata-project · Jan 16, 2017 · 041e17a · 041e17a
2 parents 150cf92 + 5446c18
commit 041e17a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Page/Service/DefaultPageService.php b/Page/Service/DefaultPageService.php
@@ -73,7 +73,9 @@ protected function updateSeoPage(PageInterface $page)
             return;
         }
 
-        $this->seoPage->setTitle($page->getTitle() ?: $page->getName());
+        if (!$this->seoPage->getTitle()) {
+            $this->seoPage->setTitle($page->getTitle() ?: $page->getName());
+        }
 
         if ($page->getMetaDescription()) {
             $this->seoPage->addMeta('name', 'description', $page->getMetaDescription());

diff --git a/Tests/Page/Service/DefaultPageServiceTest.php b/Tests/Page/Service/DefaultPageServiceTest.php
@@ -60,7 +60,8 @@ public function testExecute()
 
         // mock a page instance
         $page = $this->getMock('Sonata\PageBundle\Model\PageInterface');
-        $page->expects($this->any())->method('getTitle')->will($this->returnValue('page title'));
+        $this->seoPage->expects($this->once())->method('getTitle')->will($this->returnValue(null));
+        $page->expects($this->once())->method('getTitle')->will($this->returnValue('page title'));
         $page->expects($this->atLeastOnce())->method('getMetaDescription')->will($this->returnValue('page meta description'));
         $page->expects($this->atLeastOnce())->method('getMetaKeyword')->will($this->returnValue('page meta keywords'));
         $page->expects($this->once())->method('getTemplateCode')->will($this->returnValue('template code'));