Merge pull request #481 from magento-extensibility/MAGETWO-50795-move…

…-catalogimportexportstaging-to-ee [Extensibility] MAGETWO-50795: Move CatalogImportExportStaging to EE
magento · Mar 24, 2016 · 7073d79 · 7073d79
2 parents 9f081a1 + 7d537d0
commit 7073d79
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 43 deletions.
diff --git a/.htaccess b/.htaccess
@@ -4,6 +4,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name

diff --git a/app/bootstrap.php b/app/bootstrap.php
@@ -10,6 +10,10 @@
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
 
+/* Custom umask value may be provided in MAGE_UMASK environment variable */
+$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
+umask($mask);
+
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {
     if (PHP_SAPI == 'cli') {

diff --git a/app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php b/app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php
diff --git a/pub/.htaccess b/pub/.htaccess
@@ -1,8 +1,15 @@
 ############################################
-## uncomment the line below to enable developer mode
+## overrides deployment configuration mode value
+## use command bin/magento deploy:mode:set to switch modes
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
@@ -213,4 +220,4 @@
     ############################################
     ## prevent clickjacking
     Header set X-Frame-Options SAMEORIGIN
-</IfModule>
+</IfModule>