Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
index cdcc4bd..01227c5 100644
--- a/library/Director/CustomVariable/CustomVariables.php
+++ b/library/Director/CustomVariable/CustomVariables.php
@@ -414,10 +414,15 @@ class CustomVariables implements Iterator, Countable, IcingaConfigRenderer
 
     protected function renderKeyName($key)
     {
+        return 'vars' . self::renderKeySuffix($key);
+    }
+
+    public static function renderKeySuffix($key)
+    {
         if (preg_match('/^[a-z][a-z0-9_]*$/i', $key)) {
-            return 'vars.' . c::escapeIfReserved($key);
+            return '.' . c::escapeIfReserved($key);
         } else {
-            return 'vars[' . c::renderString($key) . ']';
+            return '[' . c::renderString($key) . ']';
         }
     }