keith/friendica
1
0
Fork 0
Code Issues Pull requests 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

12
include/pgettext.php
View file

@ -106,13 +106,11 @@ function load_translation_table($lang) {
$a->strings = array();
// load enabled plugins strings
$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");
}
$plugins = dba::select('addon', array('name'), array('installed' => true));
while ($p = dba::fetch($plugins)) {
$name = $p['name'];
if (file_exists("addon/$name/lang/$lang/strings.php")) {
include("addon/$name/lang/$lang/strings.php");
}
}