Merge pull request #7774 from totten/master-dash-err

CRM-17982 - CRM_Core_Config_MagicMerge - Fix warning on demos sites
civicrm · Feb 9, 2016 · c5906cd · c5906cd
2 parents 1c0d8fc + 3daed29
commit c5906cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CRM/Core/Config/MagicMerge.php b/CRM/Core/Config/MagicMerge.php
@@ -225,7 +225,7 @@ public function __get($k) {
         if ($value) {
           $value = CRM_Utils_File::addTrailingSlash($value);
           if (isset($this->map[$k][2]) && in_array('mkdir', $this->map[$k][2])) {
-            if (!CRM_Utils_File::createDir($value, FALSE)) {
+            if (!is_dir($value) && !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,

diff --git a/CRM/Utils/File.php b/CRM/Utils/File.php
@@ -102,10 +102,14 @@ public static function isHtml($name) {
    *   The path name.
    * @param bool $abort
    *   Should we abort or just return an invalid code.
+   * @return bool|NULL
+   *   NULL: Folder already exists or was not specified.
+   *   TRUE: Creation succeeded.
+   *   FALSE: Creation failed.
    */
   public static function createDir($path, $abort = TRUE) {
     if (is_dir($path) || empty($path)) {
-      return;
+      return NULL;
     }
 
     CRM_Utils_File::createDir(dirname($path), $abort);