From: Tim Otten <totten@civicrm.org>
Date: Thu, 4 Feb 2016 03:16:20 +0000 (-0700)
Subject: CRM_Core_Config - Display warning when mkdir fails
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=895c19e7936df2eceab00c55d2cc59ae26f89ca8;p=civicrm-core.git

CRM_Core_Config - Display warning when mkdir fails
---

diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
index b4282b657d..d4bc55978b 100644
--- a/CRM/Core/Config/MagicMerge.php
+++ b/CRM/Core/Config/MagicMerge.php
@@ -225,7 +225,12 @@ class CRM_Core_Config_MagicMerge {
         if ($value) {
           $value = CRM_Utils_File::addTrailingSlash($value);
           if (isset($this->map[$k][2]) && in_array('mkdir', $this->map[$k][2])) {
-            CRM_Utils_File::createDir($value);
+            if (!CRM_Utils_File::createDir($value, FALSE)) {
+              CRM_Core_Session::setStatus(ts('Failed to make directory (%1) at "%2". Please update the settings or file permissions.', array(
+                1 => $k,
+                2 => $value,
+              )));
+            }
           }
           if (isset($this->map[$k][2]) && in_array('restrict', $this->map[$k][2])) {
             CRM_Utils_File::restrictAccess($value);