aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2021-02-02 11:47:38 +0100
committerMario Vavti <mario@mariovavti.com>2021-02-02 11:47:38 +0100
commite312c381d897866b15179fd301d9979b46f2f678 (patch)
tree4930a612e609ad64b055ae9ad04c7f04023acd01
parentaf6f7f244e965c2dfb392b060d6e26c30dc78e31 (diff)
downloadvolse-hubzilla-e312c381d897866b15179fd301d9979b46f2f678.tar.gz
volse-hubzilla-e312c381d897866b15179fd301d9979b46f2f678.tar.bz2
volse-hubzilla-e312c381d897866b15179fd301d9979b46f2f678.zip
import_xchan() $arr photo structure has changed
-rw-r--r--Zotlabs/Lib/Libzot.php6
-rw-r--r--Zotlabs/Lib/Libzotdir.php3
-rw-r--r--include/html2bbcode.php3
3 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php
index fd30f05f5..0ead8402e 100644
--- a/Zotlabs/Lib/Libzot.php
+++ b/Zotlabs/Lib/Libzot.php
@@ -763,8 +763,8 @@ class Libzot {
'xchan_guid' => $arr['id'],
'xchan_guid_sig' => $arr['id_sig'],
'xchan_pubkey' => $arr['public_key'],
- 'xchan_photo_mimetype' => $arr['photo_mimetype'],
- 'xchan_photo_l' => $arr['photo'],
+ 'xchan_photo_mimetype' => $arr['photo']['type'],
+ 'xchan_photo_l' => $arr['photo']['url'],
'xchan_addr' => escape_tags($arr['primary_location']['address']),
'xchan_url' => escape_tags($arr['primary_location']['url']),
'xchan_connurl' => $arr['primary_location']['connections_url'],
@@ -772,7 +772,7 @@ class Libzot {
'xchan_connpage' => $arr['connect_url'],
'xchan_name' => (($arr['name']) ? escape_tags($arr['name']) : '-'),
'xchan_network' => 'zot6',
- 'xchan_photo_date' => $arr['photo_updated'],
+ 'xchan_photo_date' => $arr['photo']['updated'],
'xchan_name_date' => $arr['name_updated'],
'xchan_hidden' => intval(1 - intval($arr['searchable'])),
'xchan_selfcensored' => $arr['adult_content'],
diff --git a/Zotlabs/Lib/Libzotdir.php b/Zotlabs/Lib/Libzotdir.php
index d4c5398ee..41c0a54e9 100644
--- a/Zotlabs/Lib/Libzotdir.php
+++ b/Zotlabs/Lib/Libzotdir.php
@@ -311,12 +311,13 @@ class Libzotdir {
if ($ud['ud_addr'] && (! ($ud['ud_flags'] & UPDATE_FLAGS_DELETED))) {
$success = false;
+ $zf = [];
$href = Webfinger::zot_url(punify($ud['ud_addr']));
if($href) {
$zf = Zotfinger::exec($href);
}
- if(is_array($zf) && array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
+ if(array_path_exists('signature/signer',$zf) && $zf['signature']['signer'] === $href && intval($zf['signature']['header_valid'])) {
$xc = Libzot::import_xchan($zf['data'], 0, $ud);
}
else {
diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index c916421b8..173ea63bd 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -87,6 +87,9 @@ function deletenode(&$doc, $node)
function html2bbcode($message)
{
+ if(!$message)
+ return;
+
$message = str_replace("\r", "", $message);
$message = str_replace(array(