harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from master

Browse Source
This commit is contained in:
harukin 2018-11-21 21:49:47 +09:00
commit 1aecbbece5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/PConfig.php
View File

@ -138,7 +138,7 @@ class PConfig {
$hash = hash('sha256',$family.':'.$key); $hash = hash('sha256',$family.':'.$key);
if (self::Get($uid, 'hz_delpconfig', $hash) !== false) { if (self::Get($uid, 'hz_delpconfig', $hash) !== false) {
if (Get($uid, 'hz_delpconfig', $hash) > $updated) { if (self::Get($uid, 'hz_delpconfig', $hash) > $updated) {
logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR); logger('Refusing to update pconfig with outdated info (Item deleted more recently).', LOGGER_NORMAL, LOG_ERR);
return self::Get($uid,$family,$key); return self::Get($uid,$family,$key);
} else { } else {

2
Zotlabs/Module/Zot.php
View File

@ -19,7 +19,7 @@ class Zot extends \Zotlabs\Web\Controller {
function init() { function init() {
$zot = new ZotProtocol\Receiver(new ZotProtocol\Zot6Handler()); $zot = new ZotProtocol\Receiver(new ZotProtocol\Zot6Handler());
json_return_and_die($zot->run(),'application/x-zot+jzon'); json_return_and_die($zot->run(),'application/x-zot+json');
} }
} }