From af3db8b5c18b8ee93b9decc5a8f14cc17e4534e3 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Mon, 21 May 2018 09:45:24 -0400 Subject: [PATCH] Fix issue processwire/processwire-issues#600 where label saved to log was showing wrong path --- wire/core/WireTempDir.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wire/core/WireTempDir.php b/wire/core/WireTempDir.php index f29f0e41..91dfe12e 100644 --- a/wire/core/WireTempDir.php +++ b/wire/core/WireTempDir.php @@ -249,7 +249,6 @@ class WireTempDir extends Wire { if(!is_int($maxAge)) $maxAge = $this->tempDirMaxAge; $numSubdirs = 0; - $pathname = ''; $oldestAllowedFileTime = time() - $maxAge; $success = true; @@ -275,7 +274,7 @@ class WireTempDir extends Wire { if($removeDir) { if(!$this->rmdir($pathname, true)) { - $this->log("Unable to remove: $path"); + $this->log("Unable to remove: $pathname"); $success = false; } } else { @@ -288,7 +287,7 @@ class WireTempDir extends Wire { if($this->rmdir($path, true)) { $success = true; } else { - $this->log("Unable to remove: $pathname"); + $this->log("Unable to remove: $path"); $success = false; } } @@ -356,6 +355,7 @@ class WireTempDir extends Wire { if($this->wire('files')->mkdir($dir, $recursive)) { $dir = rtrim($dir, "/\\") . DIRECTORY_SEPARATOR; file_put_contents($dir . self::hiddenFileName, time()); + return true; } else { return false; }