clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3614 from annando/avoid-warnings 

Avoid some PHP warnings, no functional changes
This commit is contained in:
Tobias Diekershoff 2017-08-03 07:58:16 +02:00 committed by GitHub
parent c0d2e73d0a 1bd85971a4
commit b7fb43484e
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dba.php
View File

@ -161,7 +161,7 @@ class dba {
public function log_index($query) { public function log_index($query) {
$a = get_app(); $a = get_app();
if ($a->config["system"]["db_log_index"] == "") { if (empty($a->config["system"]["db_log_index"])) {
return; return;
} }

2
include/identity.php
View File

@ -929,7 +929,7 @@ function zrl($s, $force = false) {
* is set to true * is set to true
*/ */
function get_theme_uid() { function get_theme_uid() {
$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0); $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) { if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
return local_user(); return local_user();
} }

2
include/plugin.php
View File

@ -562,7 +562,7 @@ function theme_include($file, $root = '') {
if ($root !== '' && $root[strlen($root)-1] !== '/') { if ($root !== '' && $root[strlen($root)-1] !== '/') {
$root = $root . '/'; $root = $root . '/';
} }
$theme_info = $a->theme_info; $theme_info = get_app()->theme_info;
if (is_array($theme_info) && array_key_exists('extends',$theme_info)) { if (is_array($theme_info) && array_key_exists('extends',$theme_info)) {
$parent = $theme_info['extends']; $parent = $theme_info['extends'];
} else { } else {

4
view/theme/frio/php/default.php
View File

@ -9,7 +9,9 @@
require_once('view/theme/frio/php/frio_boot.php'); require_once('view/theme/frio/php/frio_boot.php');
// $minimal = is_modal(); // $minimal = is_modal();
if (!isset($minimal)) {
$minimal = false;
}
?> ?>
<html> <html>
<head> <head>

2
view/theme/frio/theme.php
View File

@ -234,6 +234,8 @@ function frio_remote_nav($a,&$nav) {
WHERE `addr` = '%s' AND `network` = 'dfrn'", WHERE `addr` = '%s' AND `network` = 'dfrn'",
dbesc($webbie)); dbesc($webbie));
$nav['remote'] = t("Visitor"); $nav['remote'] = t("Visitor");
} else {
$r = false;
} }
if (dbm::is_result($r)) { if (dbm::is_result($r)) {