diff options
| author | Mario <mario@mariovavti.com> | 2021-03-09 11:02:28 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-03-09 11:02:28 +0000 |
| commit | 53c3d0d53d27c20bdd58c99674de0881e2b0e5e6 (patch) | |
| tree | 02380a55e91c2b59e38efbf71ff012d649bcae00 /include | |
| parent | ed981ec8e818892ee15f0971e387cd269ec59689 (diff) | |
| parent | 723d757091d55a09633d09119a7214ff64d6eff0 (diff) | |
| download | volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.tar.gz volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.tar.bz2 volse-hubzilla-53c3d0d53d27c20bdd58c99674de0881e2b0e5e6.zip | |
Merge branch 'php8' into 'dev'
Stricter parameters checks for PHP 8 support
See merge request hubzilla/core!1921
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 2 | ||||
| -rw-r--r-- | include/queue_fn.php | 2 | ||||
| -rw-r--r-- | include/taxonomy.php | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php index 88f100e60..a1198bb4d 100644 --- a/include/items.php +++ b/include/items.php @@ -4853,7 +4853,7 @@ function item_remove_cid($xchan_hash,$mid,$uid) { } // Set item permissions based on results obtained from linkify_tags() -function set_linkified_perms($linkified, &$str_contact_allow, &$str_group_allow, $profile_uid, $parent_item = false, &$private) { +function set_linkified_perms($linkified, &$str_contact_allow, &$str_group_allow, $profile_uid, &$private, $parent_item = false) { $first_access_tag = true; foreach($linkified as $x) { diff --git a/include/queue_fn.php b/include/queue_fn.php index b72730d2f..b505a5b22 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -132,7 +132,7 @@ function queue_deliver($outq, $immediate = false) { $base = null; $h = parse_url($outq['outq_posturl']); if($h !== false) - $base = $h['scheme'] . '://' . $h['host'] . (($h['port']) ? ':' . $h['port'] : ''); + $base = $h['scheme'] . '://' . $h['host'] . (array_key_exists('port', $h) ? ':' . $h['port'] : ''); if(($base) && ($base !== z_root()) && ($immediate)) { $y = q("select site_update, site_dead from site where site_url = '%s' ", diff --git a/include/taxonomy.php b/include/taxonomy.php index 5fa4fde3f..f765a9f0e 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -331,11 +331,11 @@ function pubtagblock($net,$site,$limit,$recent = 0,$safemode = 1, $type = TERM_H } -function pub_tagadelic($net,$site,$limit,$recent,$safemode,$type) { - - $item_normal = item_normal(); - $count = intval($limit); - +function pub_tagadelic($net, $site, $limit, $recent, $safemode, $type) { + + $item_normal = item_normal(); + $count = intval($limit); + $sql_extra = ""; if($site) $uids = " and item.uid in ( " . stream_perms_api_uids(PERMS_PUBLIC) . " ) and item_private = 0 and item_wall = 1 "; else { |