MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php

Browse source 
Prevent some E_NOTICE
This commit is contained in:
fabrixxm 2016-03-01 15:50:20 +01:00
parent be3fa8f8b1 04eacb6470
commit 04ccd9a776
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
boot.php
View file

@ -1047,11 +1047,21 @@ class App {
function save_timestamp($stamp, $value) { function save_timestamp($stamp, $value) {
$duration = (float)(microtime(true)-$stamp); $duration = (float)(microtime(true)-$stamp);
if (!isset($this->performance[$value])) {
// Prevent ugly E_NOTICE
$this->performance[$value] = 0;
}
$this->performance[$value] += (float)$duration; $this->performance[$value] += (float)$duration;
$this->performance["marktime"] += (float)$duration; $this->performance["marktime"] += (float)$duration;
$callstack = $this->callstack(); $callstack = $this->callstack();
if (!isset($this->callstack[$value][$callstack])) {
// Prevent ugly E_NOTICE
$this->callstack[$value][$callstack] = 0;
}
$this->callstack[$value][$callstack] += (float)$duration; $this->callstack[$value][$callstack] += (float)$duration;
} }

7
include/identity.php
View file

@ -237,6 +237,7 @@ function profile_sidebar($profile, $block = 0) {
if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect'])) if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
$connect = false; $connect = false;
$remoteconnect = NULL;
if (isset($profile['remoteconnect'])) if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect']; $remoteconnect = $profile['remoteconnect'];
@ -292,9 +293,9 @@ function profile_sidebar($profile, $block = 0) {
// check if profile is a forum // check if profile is a forum
if((intval($profile['page-flags']) == PAGE_COMMUNITY) if((intval($profile['page-flags']) == PAGE_COMMUNITY)
|| (intval($profile['page-flags']) == PAGE_PRVGROUP) || (intval($profile['page-flags']) == PAGE_PRVGROUP)
|| (intval($profile['forum'])) || (isset($profile['forum']) && intval($profile['forum']))
|| (intval($profile['prv'])) || (isset($profile['prv']) && intval($profile['prv']))
|| (intval($profile['community']))) || (isset($profile['community']) && intval($profile['community'])))
$account_type = t('Forum'); $account_type = t('Forum');
else else
$account_type = ""; $account_type = "";