Merge pull request #1338 from magento-engcom/develop-prs

Public Pull Requests #10262 #10245 #10243
magento · Jul 17, 2017 · 2e8d837 · 2e8d837
2 parents ce5dbd5 + 2d776b1
commit 2e8d837
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -63,5 +63,5 @@
 date_default_timezone_set('UTC');
 
 /*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+ini_set('precision', 15);
+ini_set('serialize_precision', 15);
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
@@ -190,7 +190,8 @@ private function getAclResources()
         $configResource = array_filter(
             $resources,
             function ($node) {
-                return $node['id'] == 'Magento_Backend::admin';
+                return isset($node['id'])
+                    && $node['id'] == 'Magento_Backend::admin';
             }
         );
         $configResource = reset($configResource);

diff --git a/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php b/app/code/Magento/UrlRewrite/Block/Plugin/Store/Switcher/SetRedirectUrl.php
@@ -64,7 +64,7 @@ public function beforeGetTargetStorePostData(
         ]);
         if ($urlRewrite) {
             $data[ActionInterface::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl(
-                $this->trimSlashInPath($this->urlBuilder->getUrl($urlRewrite->getRequestPath()))
+                $this->trimSlashInPath($this->urlBuilder->getUrl($urlRewrite->getRequestPath(), ['_scope' => $store]))
             );
         }
         return [$store, $data];

diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -210,7 +210,8 @@ private function getAclResources()
         $configResource = array_filter(
             $resources,
             function ($node) {
-                return $node['id'] == 'Magento_Backend::admin';
+                return isset($node['id'])
+                    && $node['id'] == 'Magento_Backend::admin';
             }
         );
         $configResource = reset($configResource);