From f8a8559523c9c943488f690c1d3f832445a95f67 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 18 Nov 2018 10:02:01 +0000
Subject: [PATCH 1/2] fix typo which prevented propagation of comments

(cherry picked from commit 0c94747ab1c740f47e5a796f5c60efcdfcd29ba1)
---
 Zotlabs/Module/Zot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Module/Zot.php b/Zotlabs/Module/Zot.php
index 8c34dced1..1cc0e54c9 100644
--- a/Zotlabs/Module/Zot.php
+++ b/Zotlabs/Module/Zot.php
@@ -19,7 +19,7 @@ class Zot extends \Zotlabs\Web\Controller {
 
 	function init() {
 		$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');
 	}
 
 }

From 0bba9482dfbcc0fd8bea880ac3820548281ecfc2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 21 Nov 2018 13:21:29 +0100
Subject: [PATCH 2/2] fix call to undefined function

---
 Zotlabs/Lib/PConfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zotlabs/Lib/PConfig.php b/Zotlabs/Lib/PConfig.php
index b9384cf6b..5e5954c95 100644
--- a/Zotlabs/Lib/PConfig.php
+++ b/Zotlabs/Lib/PConfig.php
@@ -138,7 +138,7 @@ class PConfig {
 		$hash = hash('sha256',$family.':'.$key);
 
 		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);
 				return self::Get($uid,$family,$key);
 			} else {