TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove superfluous param, fix wrong var and declare types for unparse_url()

Browse Source
This commit is contained in:
Mario
2024-06-10 08:22:43 +00:00
parent 9348bd6ea5
commit 388e7c88df
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/Activity.php
View File

@@ -70,7 +70,7 @@ class Activity {
}
if ($items) {
return self::encode_item(array_shift($items), true);
return self::encode_item(array_shift($items));
}
return null;
@@ -2902,7 +2902,7 @@ class Activity {
if (intval($parent[0]['item_private'])) {
if (!intval($item['item_private'])) {
$item['item_private'] = intval($parent_item['item_private']);
$item['item_private'] = intval($parent[0]['item_private']);
$item['allow_cid'] = '<' . $channel['channel_hash'] . '>';
$item['allow_gid'] = $item['deny_cid'] = $item['deny_gid'] = '';
}

6
include/network.php
View File

@@ -2146,9 +2146,9 @@ function get_request_string($url) {
*
* @param array $parsed_url An associative array as produced by `parse_url`.
*
* @return The reassembled URL as a string.
* @return string The reassembled URL as a string.
*/
function unparse_url($parsed_url) {
function unparse_url(array $parsed_url): string {
$scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
$host = isset($parsed_url['host']) ? $parsed_url['host'] : '';
$port = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
@@ -2158,5 +2158,5 @@ function unparse_url($parsed_url) {
$path = isset($parsed_url['path']) ? $parsed_url['path'] : '';
$query = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
$fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
return "$scheme$user$pass$host$port$path$query$fragment";
return $scheme . $user . $pass . $host . $port . $path . $query . $fragment;
}