From d302bd070cd992da5706539634ab702960a9140b Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Wed, 27 Feb 2013 10:16:05 -0500 Subject: [PATCH] add check for false returned by query in load_translation_table --- include/pgettext.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/pgettext.php b/include/pgettext.php index fa1482002a..525b64a186 100644 --- a/include/pgettext.php +++ b/include/pgettext.php @@ -90,20 +90,21 @@ function pop_lang() { if(! function_exists('load_translation_table')) { function load_translation_table($lang) { global $a; + $a->strings = array(); if(file_exists("view/$lang/strings.php")) { include("view/$lang/strings.php"); } - // load enabled plugins strings - $plugins = $q("SELECT name FROM addon WHERE installed=1;"); - foreach($plugins as $p) { - $name = $p['name']; - if(file_exists("addon/$name/lang/$lang/strings.php")) { - include("addon/$name/lang/$lang/strings.php"); + $plugins = q("SELECT name FROM addon WHERE installed=1;"); + if ($plugins!==false) { + foreach($plugins as $p) { + $name = $p['name']; + if(file_exists("addon/$name/lang/$lang/strings.php")) { + include("addon/$name/lang/$lang/strings.php"); + } } } - }} // translate string if translation exists -- 2.39.5