From 3e7083d377f78b5c825ef3aa43a25cde0c9b8171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20Schro=CC=88der?= Date: Fri, 3 Jan 2014 17:26:55 +0100 Subject: [PATCH] fml fix --- application/core/FML/Script/Script.php | 36 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/application/core/FML/Script/Script.php b/application/core/FML/Script/Script.php index edc5e989..187605a7 100644 --- a/application/core/FML/Script/Script.php +++ b/application/core/FML/Script/Script.php @@ -325,23 +325,33 @@ class Script { */ private function buildTooltipConstants() { if (!$this->tooltips) return; - $constantText = "["; + $constantText = '['; $index = 0; $count = count($this->tooltipTexts); - foreach ($this->tooltipTexts as $tooltipId => $tooltipTexts) { - $constantText .= "\"{$tooltipId}\" => ["; - $subIndex = 0; - $subCount = count($tooltipTexts); - foreach ($tooltipTexts as $hoverId => $text) { - $constantText .= "\"{$hoverId}\" => \"{$text}\""; - if ($subIndex < $subCount - 1) $constantText .= ", "; - $subIndex++; + if ($count > 0) { + foreach ($this->tooltipTexts as $tooltipId => $tooltipTexts) { + $constantText .= '"' . $tooltipId . '"=>['; + $subIndex = 0; + $subCount = count($tooltipTexts); + if ($subCount > 0) { + foreach ($tooltipTexts as $hoverId => $text) { + $constantText .= '"' . $hoverId . '"=>"' . $text . '"'; + if ($subIndex < $subCount - 1) $constantText .= ','; + $subIndex++; + } + } + else { + $constantText .= '""'; + } + $constantText .= ']'; + if ($index < $count - 1) $constantText .= ','; + $index++; } - $constantText .= "]"; - if ($index < $count - 1) $constantText .= ", "; - $index++; } - $constantText .= "]"; + else { + $constantText .= '""=>[""=>""]'; + } + $constantText .= ']'; $this->setConstant(self::CONSTANT_TOOLTIPTEXTS, $constantText); }