From 7acc775c91a7aa80c08099a62d8d8c809adb7c0b Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 21 Jan 2022 07:45:42 +0000 Subject: wrong function name --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/text.php b/include/text.php index 666d90838..05bf2bc7c 100644 --- a/include/text.php +++ b/include/text.php @@ -3044,7 +3044,7 @@ function handle_tag(&$body, &$str_tags, $profile_uid, $tag, $in_network = true) // weird - as all the other tags are linked to something. if(local_channel() && local_channel() == $profile_uid) { - $grp = AccessList::byname($profile_uid,$name); + $grp = AccessList::by_name($profile_uid,$name); if($grp) { $g = q("select hash from pgrp where id = %d and visible = 1 limit 1", -- cgit v1.2.3 From f06c970628ab9e33641e51d3b1ff13bab013b30e Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 23 Jan 2022 20:23:40 +0000 Subject: port z_curl_error() from zap --- include/network.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include') diff --git a/include/network.php b/include/network.php index 1b8f0e663..64605749d 100644 --- a/include/network.php +++ b/include/network.php @@ -400,6 +400,18 @@ function z_post_url($url, $params, $redirects = 0, $opts = array()) { return($ret); } +function z_curl_error($ret) { + $output = EMPTY_STR; + if (isset($ret['debug'])) { + $output .= datetime_convert() . EOL; + $output .= t('url: ') . $ret['debug']['url'] . EOL; + $output .= t('error_code: ') . $ret['debug']['error_code'] . EOL; + $output .= t('error_string: ') . $ret['error'] . EOL; + $output .= t('content-type: ') . $ret['debug']['content_type'] . EOL; + } + return $output; +} + function json_return_and_die($x, $content_type = 'application/json') { header("Content-type: $content_type"); echo json_encode($x); -- cgit v1.2.3 From e8069c0d932aae60564cbd944a4aa3372bc9507d Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 26 Jan 2022 13:58:03 +0000 Subject: use item_hidden instead of item_notshown for forum comment announces --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 7a899a3fd..822e2d88b 100644 --- a/include/items.php +++ b/include/items.php @@ -3329,7 +3329,7 @@ function start_delivery_chain($channel, $item, $item_id, $parent, $group = false $arr['item_private'] = (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 1 : 0); $arr['item_origin'] = 1; - $arr['item_notshown'] = 1; + $arr['item_hidden'] = 1; $arr['item_thread_top'] = 0; -- cgit v1.2.3 From b13a9f57aff3e455901ba51e3fc26abfb8d89aca Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 27 Jan 2022 21:10:13 +0000 Subject: fix for #1659 --- include/text.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/text.php b/include/text.php index 05bf2bc7c..aea8790fc 100644 --- a/include/text.php +++ b/include/text.php @@ -586,6 +586,7 @@ function alt_pager($i, $more = '', $less = '') { '$less' => $less, '$more' => $more, '$url' => $url, + '$url_appendix' => ((strpos($url, '?')) ? '&' : '?'), '$prevpage' => App::$pager['page'] - 1, '$nextpage' => App::$pager['page'] + 1, )); -- cgit v1.2.3