diff options
Diffstat (limited to 'inc/dictionary.inc.php')
| -rw-r--r-- | inc/dictionary.inc.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php index 58127c18..b8a888d5 100644 --- a/inc/dictionary.inc.php +++ b/inc/dictionary.inc.php @@ -58,7 +58,10 @@ class Dictionary if ($content === false) Util::traceError("Could not find language file $template for language $lang"); $language = array('lang' => $lang); - return array_merge($language, json_decode($content, true)); + $json = json_decode($content, true); + if (!is_array($json)) + return $language; + return array_merge($language, $json); } public static function translate($string) |