From 5643616e50581dbb29d8ce1b177af56b1c297ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Huet?= <jeremy.huet@gmail.com>
Date: Sun, 28 Dec 2014 16:47:59 +0100
Subject: [PATCH] Only tries to guess web server user if none provided with
 'group' parameter

---
 .../Filesystem/PermissionsReadableOnlyByWebServerTask.php      | 2 +-
 Mage/Task/BuiltIn/Filesystem/PermissionsTask.php               | 3 ++-
 .../BuiltIn/Filesystem/PermissionsWritableByWebServerTask.php  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Mage/Task/BuiltIn/Filesystem/PermissionsReadableOnlyByWebServerTask.php b/Mage/Task/BuiltIn/Filesystem/PermissionsReadableOnlyByWebServerTask.php
index d0a04e8..375489d 100644
--- a/Mage/Task/BuiltIn/Filesystem/PermissionsReadableOnlyByWebServerTask.php
+++ b/Mage/Task/BuiltIn/Filesystem/PermissionsReadableOnlyByWebServerTask.php
@@ -29,7 +29,7 @@ class PermissionsReadableOnlyByWebServerTask extends PermissionsTask
     {
         parent::init();
 
-        $this->setGroup($this->getParameter('group', $this->getWebServerUser()))
+        $this->setGroup($this->getParameter('group') ? $this->getParameter('group') : $this->getWebServerUser())
              ->setRights('040');
     }
 
diff --git a/Mage/Task/BuiltIn/Filesystem/PermissionsTask.php b/Mage/Task/BuiltIn/Filesystem/PermissionsTask.php
index 8f1f6f4..171770b 100644
--- a/Mage/Task/BuiltIn/Filesystem/PermissionsTask.php
+++ b/Mage/Task/BuiltIn/Filesystem/PermissionsTask.php
@@ -27,7 +27,8 @@ use Mage\Task\SkipException;
 class PermissionsTask extends AbstractTask
 {
     /**
-     * Paths to change of permissions separated by PATH_SEPARATOR.
+     * Paths to change of permissions in an array or a string separated by
+     * PATH_SEPARATOR.
      *
      * If the stage is on local host you should give full paths. If on remote
      * you may give full or relative to the current release directory paths.
diff --git a/Mage/Task/BuiltIn/Filesystem/PermissionsWritableByWebServerTask.php b/Mage/Task/BuiltIn/Filesystem/PermissionsWritableByWebServerTask.php
index ec1fe7d..6abaf07 100644
--- a/Mage/Task/BuiltIn/Filesystem/PermissionsWritableByWebServerTask.php
+++ b/Mage/Task/BuiltIn/Filesystem/PermissionsWritableByWebServerTask.php
@@ -29,7 +29,7 @@ class PermissionsWritableByWebServerTask extends PermissionsTask
     {
         parent::init();
 
-        $this->setGroup($this->getParameter('group', $this->getWebServerUser()))
+        $this->setGroup($this->getParameter('group') ? $this->getParameter('group') : $this->getWebServerUser())
              ->setRights('g+w');
     }