valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:fox/tt-rss

This commit is contained in:
Andrew Dolgov 2022-03-10 14:45:44 +03:00
parent 6f14a5b261 95431890be
commit 1703850215
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeditem/atom.php
View File

@ -70,7 +70,7 @@ class FeedItem_Atom extends FeedItem_Common {
* *
* @return string the rewritten XML or original $content * @return string the rewritten XML or original $content
*/ */
private function rewrite_content_to_base(?string $base = null, string $content) { private function rewrite_content_to_base(?string $base = null, ?string $content = '') {
if (!empty($base) && !empty($content)) { if (!empty($base) && !empty($content)) {

2
classes/feedparser.php
View File

@ -200,7 +200,7 @@ class FeedParser {
// libxml may have invalid unicode data in error messages // libxml may have invalid unicode data in error messages
function error() : string { function error() : string {
return UConverter::transcode($this->error, 'UTF-8', 'UTF-8'); return UConverter::transcode($this->error ?? '', 'UTF-8', 'UTF-8');
} }
/** @return array<string> - WARNING: may return invalid unicode data */ /** @return array<string> - WARNING: may return invalid unicode data */

2
classes/feeds.php
View File

@ -23,7 +23,7 @@ class Feeds extends Handler_Protected {
*/ */
private function _format_headlines_list($feed, string $method, string $view_mode, int $limit, bool $cat_view, private function _format_headlines_list($feed, string $method, string $view_mode, int $limit, bool $cat_view,
int $offset, string $override_order, bool $include_children, ?int $check_first_id = null, int $offset, string $override_order, bool $include_children, ?int $check_first_id = null,
bool $skip_first_id_check, string $order_by): array { ?bool $skip_first_id_check = false, ? string $order_by = ''): array {
$disable_cache = false; $disable_cache = false;

2
classes/pref/system.php
View File

@ -138,7 +138,7 @@ class Pref_System extends Handler_Administrative {
$sth->execute($errno_values); $sth->execute($errno_values);
while ($line = $sth->fetch()) { while ($line = $sth->fetch()) {
foreach ($line as $k => $v) { $line[$k] = htmlspecialchars($v); } foreach ($line as $k => $v) { $line[$k] = htmlspecialchars($v ?? ''); }
?> ?>
<tr> <tr>
<td class='errno'> <td class='errno'>

2
lib/jimIcon.php
View File

@ -31,7 +31,7 @@ class jimIcon {
} }
if ($a != 127) if ($a != 127)
$this->all_transaprent = 0; $this->all_transaprent = 0;
return imagecolorallocatealpha($img, $r, $g, $b, $a); return imagecolorallocatealpha($img, $r, $g, $b, (int) $a);
} }
// Given a string with the contents of an .ICO, // Given a string with the contents of an .ICO,