Merge branch '2.0' of https://github.corp.magento.com/magento-sparta/magento2ce into MDVA-158

Author: Bukatar

.htaccess

@@ -279,6 +279,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+            order allow,deny
+            deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

.htaccess.sample

@@ -245,6 +245,10 @@
         order allow,deny
         deny from all
     </Files>
+    <Files magento_umask>
+            order allow,deny
+            deny from all
+    </Files>
 
 ################################
 ## If running in cluster environment, uncomment this

CHANGELOG.md

@@ -1,3 +1,22 @@
+2.0.5
+=============
+* Fixed bugs:
+    * Fixed issue with HTML minification and comments
+    * Fixed issue with cached CAPTCHA
+    * Fixed issue with images not changing on swatches
+    * Fixed issue with admin URL being indexed in search engines
+    * Fixed issue with viewing products from shared wishlists
+    * Fixed inconsistent data during installation
+    * Fixed issue with saving custom customer attributes during checkout
+    * Fixed issue with multiple newsletter subscriptions for same email
+    * Fixed import issue for products with store code
+* GitHub requests:
+    * [#2795](https://github.com/magento/magento2/pull/2795) -- Fix Notice: Undefined property: Magento\Backend\Helper\Dashboard\Order::$_storeManager
+    * [#2989](https://github.com/magento/magento2/issues/2989) -- Custom Options not working after editing product
+* Various improvements:
+    * Improved export performance
+    * Fixed several performance issue with duplicated queries on category and CMS pages
+
 2.0.3
 =============
 * Fixed bugs:

app/bootstrap.php

@@ -9,7 +9,6 @@
  */
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
-umask(0);
 
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {
@@ -31,6 +30,11 @@
 require_once __DIR__ . '/autoload.php';
 require_once BP . '/app/functions.php';
 
+/* Custom umask value may be provided in optional mage_umask file in root */
+$umaskFile = BP . '/magento_umask';
+$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
+umask($mask);
+
 if (!empty($_SERVER['MAGE_PROFILER'])
     && isset($_SERVER['HTTP_ACCEPT'])
     && strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -531,15 +531,21 @@ protected function processCountExistingPrices($prices, $table)
     {
         $existingPrices = $this->_connection->fetchAssoc(
             $this->_connection->select()->from(
-                $this->_connection->getTableName($table),
+                ['t' => $this->_connection->getTableName($table)],
                 ['value_id', 'entity_id', 'all_groups', 'customer_group_id']
             )
+            ->joinInner(
+                ['e' => $this->_connection->getTableName('catalog_product_entity')],
+                't.entity_id = e.entity_id',
+                ['e.sku']
+            )
+            ->where(
+                $this->_connection->quoteInto('e.sku IN (?)', array_keys($prices))
+            )
         );
         foreach ($existingPrices as $existingPrice) {
-            foreach ($this->_oldSkus as $sku => $productId) {
-                if ($existingPrice['entity_id'] == $productId && isset($prices[$sku])) {
-                    $this->incrementCounterUpdated($prices[$sku], $existingPrice);
-                }
+            if (isset($prices[$existingPrice['sku']])) {
+                $this->incrementCounterUpdated($prices[$existingPrice['sku']], $existingPrice);
             }
         }
 

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/Helper/Dashboard/Order.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Helper\Dashboard;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml dashboard helper for orders
  */
@@ -15,6 +17,11 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
      */
     protected $_orderCollection;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $_storeManager;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
@@ -41,17 +48,31 @@ protected function _initCollection()
         if ($this->getParam('store')) {
             $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
         } elseif ($this->getParam('website')) {
-            $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif ($this->getParam('group')) {
-            $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif (!$this->_collection->isLive()) {
             $this->_collection->addFieldToFilter(
                 'store_id',
-                ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+                ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
             );
         }
         $this->_collection->load();
     }
+
+    /**
+     * Get Store Manager
+     *
+     * @return \Magento\Store\Model\StoreManagerInterface
+     */
+    public function getStoreManager()
+    {
+        if (!$this->_storeManager) {
+            $this->_storeManager = ObjectManager::getInstance()->get('Magento\Store\Model\StoreManager');
+        }
+
+        return $this->_storeManager;
+    }
 }

app/code/Magento/Backend/Model/Session/AdminConfig.php

@@ -14,8 +14,6 @@
 
 /**
  * Magento Backend session configuration
- *
- * @method Config setSaveHandler()
  */
 class AdminConfig extends Config
 {

app/code/Magento/Backend/composer.json

@@ -21,7 +21,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -91,7 +91,6 @@ protected function _hideBackupsForApache()
         $filename = '.htaccess';
         if (!$this->_varDirectory->isFile($filename)) {
             $this->_varDirectory->writeFile($filename, 'deny from all');
-            $this->_varDirectory->changePermissions($filename, 0640);
         }
     }