Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 19:20:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3831 from annando/issue-3828

Browse source 
Issue 3828: Better handling if query doesn't return a value
This commit is contained in:
Tobias Diekershoff 2017-10-29 08:10:53 +01:00 committed by GitHub
commit bf29d81984
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/pgettext.php
View file

@ -106,15 +106,13 @@ function load_translation_table($lang) {
$a->strings = array(); $a->strings = array();
// load enabled plugins strings // load enabled plugins strings
$plugins = q("SELECT name FROM addon WHERE installed=1;"); $plugins = dba::select('addon', array('name'), array('installed' => true));
if ($plugins!==false) { while ($p = dba::fetch($plugins)) {
foreach ($plugins as $p) {
$name = $p['name']; $name = $p['name'];
if (file_exists("addon/$name/lang/$lang/strings.php")) { if (file_exists("addon/$name/lang/$lang/strings.php")) {
include("addon/$name/lang/$lang/strings.php"); include("addon/$name/lang/$lang/strings.php");
} }
} }
}
if (file_exists("view/lang/$lang/strings.php")) { if (file_exists("view/lang/$lang/strings.php")) {
include("view/lang/$lang/strings.php"); include("view/lang/$lang/strings.php");