🔃 [EngCom] Public Pull Requests - 2.1-develop

magento-engcom-team · web-flow · commit af027e5544d0 · 2018-03-30T02:40:11.000-05:00
Accepted Public Pull Requests: - #14323: #7816: Customer_account.xml file abused (2.1) (by @mikewhitby) - #14417: [BACKPORT 2.1] Removed cache backend option which explicitly set file permissions (by @xtremeperf) Fixed GitHub Issues: - #7816: Customer_account.xml file abused (reported by @LiamFielding) has been fixed in #14323 by @mikewhitby in 2.1-develop branch Related commits: 1. 509e5c4 2. 4f30a3c - #10700: Magento 2 Admin panel show loading on each page (reported by @historylife) has been fixed in #14417 by @xtremeperf in 2.1-develop branch Related commits: 1. e577458 - #11930: setup:di:compile's generated cache files inaccessible by the web-server user (reported by @JanisE) has been fixed in #14417 by @xtremeperf in 2.1-develop branch Related commits: 1. e577458
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">
diff --git a/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml b/app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <title>Billing Agreements</title>
-    </head>
     <body>
         <referenceBlock name="customer_account_navigation">
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-billing-agreements-link">
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -68,7 +68,6 @@ class Factory
      */
     protected $_backendOptions = [
         'hashed_directory_level' => 1,
-        'hashed_directory_umask' => 0777,
         'file_name_prefix' => 'mage',
     ];
 

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`	`}`