diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/network.php | 12 | ||||
| -rw-r--r-- | include/text.php | 1 |
3 files changed, 14 insertions, 1 deletions
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; 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); 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, )); |