From 9b5bb433f6bb3a432965d08bb107342e168a9d13 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 5 Jul 2012 14:47:58 +0000
Subject: [PATCH] Forced file preference left empty now means user choice - was
 forced to '', which was really hard to give users choice again

---
 preferences/inc/class.bosettings.inc.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/preferences/inc/class.bosettings.inc.php b/preferences/inc/class.bosettings.inc.php
index 8b0f50ef47..c3ad9384ed 100644
--- a/preferences/inc/class.bosettings.inc.php
+++ b/preferences/inc/class.bosettings.inc.php
@@ -240,6 +240,15 @@
 							if ($value === '')
 							{
 								// empty is always allowed
+
+								// If forced, empty == not set
+								if($type == 'forced')
+								{
+									unset($prefs[$var]);
+									// need to call preferences::delete, to also set affective prefs!
+									if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+									continue;
+								}
 							}
 							elseif ($vfs_type == 'vfs_file')
 							{