#7816: Customer_account.xml file abused

mikewhitby · mikewhitby · commit 4f30a3cf3451 · 2018-03-24T13:34:54.000Z
This is in addiiton to #12852 commit 36cac17 - that fix removed the title from being set in the `customer_account.xml` file but the fix seemed to do nothing as the title was always being set in the controller anyway. I've removed from the controller and added to the correct layout file.
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -35,9 +35,6 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('My Account'));
-        return $resultPage;
+        return $this->resultPageFactory->create();
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Customer My Account (All Pages)" design_abstraction="custom">
+    <head>
+        <title>My Account</title>
+    </head>
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="sidebar.main">

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ public function __construct(`
`35`	`35`	`*/`
`36`	`36`	`public function execute()`
`37`	`37`	`{`
`38`		`- /** @var \Magento\Framework\View\Result\Page $resultPage */`
`39`		`- $resultPage = $this->resultPageFactory->create();`
`40`		`- $resultPage->getConfig()->getTitle()->set(__('My Account'));`
`41`		`- return $resultPage;`
	`38`	`+ return $this->resultPageFactory->create();`
`42`	`39`	`}`
`43`	`40`	`}`