🔃 [EngCom] Public Pull Requests - 2.1-develop

Stanislav Idolov · web-flow · commit 267d91d58bea · 2018-07-30T14:04:21.000+03:00
Accepted Public Pull Requests: - #17260: [Backport] Using interface instead of model directly (by @mage2pratik) - #17182: [Backport] DOBISSUE date format changed after customer tries to register with sa (by @gelanivishal) - #16898: [Backport] Prevent running SQL query on every item in the database when the quote is empty (by @mage2pratik)
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -127,7 +127,8 @@ protected function getFormFilter()
     protected function applyOutputFilter($value)
     {
         $filter = $this->getFormFilter();
-        if ($filter) {
+        if ($filter && $value) {
+            $value = date('Y-m-d', $this->getTime());
             $value = $filter->outputFilter($value);
         }
         return $value;
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -272,6 +272,10 @@ protected function _assignProducts()
      */
     private function removeItemsWithAbsentProducts()
     {
+        if (count($this->_productIds) === 0) {
+            return;
+        }
+
         $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
         $existingProductsIds = $productCollection->getAllIds();
         $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
@@ -94,7 +94,7 @@
     </type>
     <type name="Magento\Framework\App\Area">
         <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="translator" xsi:type="object">Magento\Framework\TranslateInterface</argument>
             <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
         </arguments>
     </type>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -7,6 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
+        <meta name="robots" content="NOINDEX,NOFOLLOW"/>
         <css src="jquery/jstree/themes/default/style.css"/>
         <css src="css/styles-old.css"/>
         <css src="css/styles.css"/>

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ protected function getFormFilter()`
`127`	`127`	`protected function applyOutputFilter($value)`
`128`	`128`	`{`
`129`	`129`	`$filter = $this->getFormFilter();`
`130`		`- if ($filter) {`
	`130`	`+ if ($filter && $value) {`
	`131`	`+ $value = date('Y-m-d', $this->getTime());`
`131`	`132`	`$value = $filter->outputFilter($value);`
`132`	`133`	`}`
`133`	`134`	`return $value;`