bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #5719 from annando/notices-yeah

Browse source 
Good news, everyone - again somce notices removed
This commit is contained in:
Hypolite Petovan 2018-09-04 19:09:11 -04:00 • committed by GitHub
commit 59d06b6c78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/App.php
View file

@ -1074,7 +1074,11 @@ class App
$meminfo = [];
foreach ($memdata as $line) {
list($key, $val) = explode(':', $line);
$data = explode(':', $line);
if (count($data) != 2) {
continue;
}
list($key, $val) = $data;
$meminfo[$key] = (int) trim(str_replace('kB', '', $val));
$meminfo[$key] = (int) ($meminfo[$key] / 1024);
}

2
src/Util/HTTPSignature.php
View file

@ -125,6 +125,8 @@ class HTTPSignature
$key = $key($sig_block['keyId']);
}
logger('Got keyID ' . $sig_block['keyId']);
// We don't use Activity Pub at the moment.
// if (!$key) {
// $result['signer'] = $sig_block['keyId'];