Merge remote-tracking branch 'magento2/develop' into MAGETWO-32931

Author: Viktor Tymchynskyi

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -185,70 +185,94 @@ public function __construct(
     }
 
     /**
-     * Return one-level child directories for specified path
+     * Create sub directories if DB storage is used
      *
-     * @param string $path Parent directory path
-     * @return \Magento\Framework\Data\Collection\Filesystem
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @param string $path
+     * @return void
      */
-    public function getDirsCollection($path)
+    protected function createSubDirectories($path)
     {
         if ($this->_coreFileStorageDb->checkDbUsage()) {
             /** @var \Magento\MediaStorage\Model\File\Storage\Directory\Database $subDirectories */
             $subDirectories = $this->_directoryDatabaseFactory->create();
-            $subDirectories->getSubdirectories($path);
-            foreach ($subDirectories as $directory) {
+            $directories = $subDirectories->getSubdirectories($path);
+            foreach ($directories as $directory) {
                 $fullPath = rtrim($path, '/') . '/' . $directory['name'];
                 $this->_directory->create($fullPath);
             }
         }
+    }
 
+    /**
+     * Prepare and get conditions for exclude directories
+     *
+     * @return array
+     */
+    protected function getConditionsForExcludeDirs()
+    {
         $conditions = ['reg_exp' => [], 'plain' => []];
 
         if ($this->_dirs['exclude']) {
             foreach ($this->_dirs['exclude'] as $dir) {
-                $conditions[$dir->getAttribute('regexp') ? 'reg_exp' : 'plain'][$dir] = true;
+                $conditions[!empty($dir['regexp']) ? 'reg_exp' : 'plain'][$dir['name']] = true;
             }
         }
 
         // "include" section takes precedence and can revoke directory exclusion
         if ($this->_dirs['include']) {
             foreach ($this->_dirs['include'] as $dir) {
-                unset($conditions['regexp'][(string)$dir], $conditions['plain'][$dir]);
+                unset($conditions['reg_exp'][$dir['name']], $conditions['plain'][$dir['name']]);
             }
         }
 
+        return $conditions;
+    }
+
+    /**
+     * Remove excluded directories from collection
+     *
+     * @param \Magento\Framework\Data\Collection\Filesystem $collection
+     * @param array $conditions
+     * @return \Magento\Framework\Data\Collection\Filesystem
+     */
+    protected function removeItemFromCollection($collection, $conditions)
+    {
         $regExp = $conditions['reg_exp'] ? '~' . implode('|', array_keys($conditions['reg_exp'])) . '~i' : null;
-        $collection = $this->getCollection(
-            $path
-        )->setCollectDirs(
-            true
-        )->setCollectFiles(
-            false
-        )->setCollectRecursively(
-            false
-        );
         $storageRootLength = strlen($this->_cmsWysiwygImages->getStorageRoot());
 
         foreach ($collection as $key => $value) {
             $rootChildParts = explode('/', substr($value->getFilename(), $storageRootLength));
 
-            if (array_key_exists(
-                $rootChildParts[0],
-                $conditions['plain']
-            ) || $regExp && preg_match(
-                $regExp,
-                $value->getFilename()
-            )
-            ) {
+            if (array_key_exists($rootChildParts[1], $conditions['plain'])
+                || ($regExp && preg_match($regExp, $value->getFilename()))) {
+
                 $collection->removeItemByKey($key);
             }
         }
 
         return $collection;
     }
 
+    /**
+     * Return one-level child directories for specified path
+     *
+     * @param string $path Parent directory path
+     * @return \Magento\Framework\Data\Collection\Filesystem
+     */
+    public function getDirsCollection($path)
+    {
+        $this->createSubDirectories($path);
+
+        $collection = $this->getCollection($path)
+            ->setCollectDirs(true)
+            ->setCollectFiles(false)
+            ->setCollectRecursively(false);
+
+        $conditions = $this->getConditionsForExcludeDirs();
+
+        return $this->removeItemFromCollection($collection, $conditions);
+    }
+
     /**
      * Return files
      *

app/code/Magento/Cms/Setup/InstallData.php

@@ -111,13 +111,12 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         </span>
     </div>
     <p>
-        This privacy policy sets out how {{config path="general/store_information/name"}} uses and protects any
-        information that you give {{config path="general/store_information/name"}} when you use this website.
-        {{config path="general/store_information/name"}} is committed to ensuring that your privacy is protected.
-        Should we ask you to provide certain information by which you can be identified when using this website,
-        then you can be assured that it will only be used in accordance with this privacy statement.
-        {{config path="general/store_information/name"}} may change this policy from time to time by updating this page.
-        You should check this page from time to time to ensure that you are happy with any changes.
+        This privacy policy sets out how this website (hereafter "the Store") uses and protects any information that
+        you give the Store while using this website. The Store is committed to ensuring that your privacy is protected.
+        Should we ask you to provide certain information by which you can be identified when using this website, then
+        you can be assured that it will only be used in accordance with this privacy statement. The Store may change
+        this policy from time to time by updating this page. You should check this page from time to time to ensure
+        that you are happy with any changes.
     </p>
     <h2>What we collect</h2>
     <p>We may collect the following information:</p>
@@ -191,8 +190,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
         </li>
         <li>
             if you have previously agreed to us using your personal information for direct marketing purposes,
-            you may change your mind at any time by writing to or emailing us at
-            {{config path="trans_email/ident_general/email"}}
+            you may change your mind at any time by letting us know using our Contact Us information
         </li>
     </ul>
     <p>
@@ -202,8 +200,8 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
     </p>
     <p>
         You may request details of personal information which we hold about you under the Data Protection Act 1998.
-        A small fee will be payable. If you would like a copy of the information held on you please write to
-        {{config path="general/store_information/address"}}.
+        A small fee will be payable. If you would like a copy of the information held on you please email us this
+        request using our Contact Us information.
     </p>
     <p>
         If you believe that any information we are holding on you is incorrect or incomplete,