From 4978d111b52ca1e7f324a557d7f299c5a5c79e40 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Wed, 14 Oct 2015 21:50:28 +0200
Subject: Only try to remove old cachedir if it was actually configured,
 instead of unset

---
 config/squid3/34/squid_cache.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'config/squid3')

diff --git a/config/squid3/34/squid_cache.xml b/config/squid3/34/squid_cache.xml
index 47471df9..b4f1aedf 100755
--- a/config/squid3/34/squid_cache.xml
+++ b/config/squid3/34/squid_cache.xml
@@ -42,8 +42,8 @@
 	]]>
 	</copyright>
 	<name>squidcache</name>
-	<version>0.4.0</version>
-	<title>Proxy Server: Cache management</title>
+	<version>0.4.1</version>
+	<title>Proxy Server: Cache Management</title>
 	<include_file>/usr/local/pkg/squid.inc</include_file>
 	<tabs>
 		<tab>
@@ -410,7 +410,9 @@
 		// do not leave orphaned cachedirs if harddisk_cache_location changed
 		if ($_POST['harddisk_cache_location'] != $config['installedpackages']['squidcache']['config'][0]['harddisk_cache_location']) {
 			$oldcachedir = $config['installedpackages']['squidcache']['config'][0]['harddisk_cache_location'];
-			$cachedir_changed = true;
+			if ($oldcachedir != "") {
+				$cachedir_changed = true;
+			}
 		}
 	]]>
 	</custom_php_command_before_form>
-- 
cgit v1.2.3