1
0
Fork 0

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2014-06-19 23:01:33 +02:00
commit 7eea5fc212
3 changed files with 3 additions and 3 deletions

View file

@ -100,6 +100,7 @@ if(! function_exists('load_translation_table')) {
function load_translation_table($lang) {
global $a;
$a->strings = array();
// load enabled plugins strings
$plugins = q("SELECT name FROM addon WHERE installed=1;");
if ($plugins!==false) {
@ -111,7 +112,6 @@ function load_translation_table($lang) {
}
}
$a->strings = array();
if(file_exists("view/$lang/strings.php")) {
include("view/$lang/strings.php");
}