From efd0b50052861a7dc83f5d5a84a9929d012131e6 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 8 Sep 2016 22:40:07 +0000 Subject: [PATCH] CustomVariable: reset 'deleted' when re-setting... ...a value --- library/Director/CustomVariable/CustomVariableArray.php | 2 ++ library/Director/CustomVariable/CustomVariableBoolean.php | 1 + library/Director/CustomVariable/CustomVariableDictionary.php | 2 ++ library/Director/CustomVariable/CustomVariableNull.php | 2 ++ library/Director/CustomVariable/CustomVariableNumber.php | 1 + library/Director/CustomVariable/CustomVariableString.php | 2 ++ 6 files changed, 10 insertions(+) diff --git a/library/Director/CustomVariable/CustomVariableArray.php b/library/Director/CustomVariable/CustomVariableArray.php index a336cb67..1c182370 100644 --- a/library/Director/CustomVariable/CustomVariableArray.php +++ b/library/Director/CustomVariable/CustomVariableArray.php @@ -60,6 +60,8 @@ class CustomVariableArray extends CustomVariable $this->setModified(); } + $this->deleted = false; + return $this; } diff --git a/library/Director/CustomVariable/CustomVariableBoolean.php b/library/Director/CustomVariable/CustomVariableBoolean.php index 50fbc9f7..e1af6262 100644 --- a/library/Director/CustomVariable/CustomVariableBoolean.php +++ b/library/Director/CustomVariable/CustomVariableBoolean.php @@ -36,6 +36,7 @@ class CustomVariableBoolean extends CustomVariable } $this->value = $value; + $this->deleted = false; return $this; } diff --git a/library/Director/CustomVariable/CustomVariableDictionary.php b/library/Director/CustomVariable/CustomVariableDictionary.php index 4ddb13ac..ec94a33e 100644 --- a/library/Director/CustomVariable/CustomVariableDictionary.php +++ b/library/Director/CustomVariable/CustomVariableDictionary.php @@ -46,6 +46,8 @@ class CustomVariableDictionary extends CustomVariable implements Countable $new[$key] = self::wantCustomVariable($key, $val); } + $this->deleted = false; + // WTF? if ($this->value === $new) { return $this; diff --git a/library/Director/CustomVariable/CustomVariableNull.php b/library/Director/CustomVariable/CustomVariableNull.php index 1685fb99..6a0397ac 100644 --- a/library/Director/CustomVariable/CustomVariableNull.php +++ b/library/Director/CustomVariable/CustomVariableNull.php @@ -36,6 +36,8 @@ class CustomVariableNull extends CustomVariable ); } + $this->deleted = false; + return $this; } diff --git a/library/Director/CustomVariable/CustomVariableNumber.php b/library/Director/CustomVariable/CustomVariableNumber.php index 04440875..7816fa6f 100644 --- a/library/Director/CustomVariable/CustomVariableNumber.php +++ b/library/Director/CustomVariable/CustomVariableNumber.php @@ -49,6 +49,7 @@ class CustomVariableNumber extends CustomVariable } $this->value = $value; + $this->deleted = false; return $this; } diff --git a/library/Director/CustomVariable/CustomVariableString.php b/library/Director/CustomVariable/CustomVariableString.php index bda99a75..b67b3322 100644 --- a/library/Director/CustomVariable/CustomVariableString.php +++ b/library/Director/CustomVariable/CustomVariableString.php @@ -31,6 +31,8 @@ class CustomVariableString extends CustomVariable $this->setModified(); } + $this->deleted = false; + return $this; }