servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-07-27 16:47:59 +02:00
Code Issues Releases Wiki Activity

Merge branch 'bugfix/decoded-srcset-result' into 'master'

Browse Source 
Don't reuse the '$matches' array in 'RSSUtils::decode_srcset()'.

See merge request tt-rss/tt-rss!43
This commit is contained in:
Andrew Dolgov 2024-07-10 19:59:38 +00:00
commit a758d287ff
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classes/RSSUtils.php
View File

@ -2074,27 +2074,14 @@ class RSSUtils {
$srcset, $matches, PREG_SET_ORDER
);
foreach ($matches as $m) {
array_push($matches, [
"url" => trim($m["url"]),
"size" => trim($m["size"])
]);
}
return $matches;
return array_map(fn(array $m) => ['url' => trim($m['url']), 'size' => trim($m['size'])], $matches);
}
/**
* @param array<int, array<string, string>> $matches An array of srcset subitem arrays with keys "url" and "size"
*/
static function encode_srcset(array $matches): string {
$tokens = [];
foreach ($matches as $m) {
array_push($tokens, trim($m["url"]) . " " . trim($m["size"]));
}
return implode(",", $tokens);
return implode(',', array_map(fn(array $m) => trim($m['url']) . ' ' . trim($m['size']), $matches));
}
static function function_enabled(string $func): bool {