BUG: refs #0380. Added better checking if empty tempDir came back from settings.

Michael Grauer · Michael Grauer · commit 348db0067e73 · 2011-12-12T20:39:03.000-05:00
diff --git a/core/controllers/components/UtilityComponent.php b/core/controllers/components/UtilityComponent.php
@@ -394,6 +394,10 @@ public static function getTempDirectory($subdir = "misc")
       {
       // if the setting model hasn't been installed, or there is no
       // value in the settings table for this, provide a default
+      $tempDirectory = null;
+      }
+    if(!isset($tempDirectory) || empty($tempDirectory))
+      {
       $tempDirectory = BASE_PATH.'/tmp';
       }
     return $tempDirectory .'/'.$subdir.'/';

Original file line number	Diff line number	Diff line change
`@@ -394,6 +394,10 @@ public static function getTempDirectory($subdir = "misc")`
`394`	`394`	`{`
`395`	`395`	`// if the setting model hasn't been installed, or there is no`
`396`	`396`	`// value in the settings table for this, provide a default`
	`397`	`+ $tempDirectory = null;`
	`398`	`+ }`
	`399`	`+ if(!isset($tempDirectory) \|\| empty($tempDirectory))`
	`400`	`+ {`
`397`	`401`	`$tempDirectory = BASE_PATH.'/tmp';`
`398`	`402`	`}`
`399`	`403`	`return $tempDirectory .'/'.$subdir.'/';`