public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 04:55:54 +00:00
Code Issues Releases Wiki Activity

Revert "various fixes vor php 8.1 compatibility"

Browse Source 
This reverts commit 14027ae04e.
This commit is contained in:
Andrew Dolgov
2021-12-01 13:37:35 +03:00
parent aaebe55456
commit a201e10ee0
9 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
classes/config.php
View File

@@ -359,7 +359,7 @@ class Config {
if ($check == "version") {
$rv["version"] = date("%y.%m", (int)$timestamp) . "-$commit";
$rv["version"] = strftime("%y.%m", (int)$timestamp) . "-$commit";
$rv["commit"] = $commit;
$rv["timestamp"] = $timestamp;

2
classes/debug.php
View File

@@ -88,7 +88,7 @@ class Debug {
if (!self::$enabled || self::$loglevel < $level) return false;
$ts = date("%H:%M:%S", time());
$ts = strftime("%H:%M:%S", time());
if (function_exists('posix_getpid')) {
$ts = "$ts/" . posix_getpid();
}

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
*/
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)) {

2
classes/feedparser.php
View File

@@ -201,7 +201,7 @@ class FeedParser {
// libxml may have invalid unicode data in error messages
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 */

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,
int $offset, string $override_order, bool $include_children, ?int $check_first_id = null,
?bool $skip_first_id_check = false, ? string $order_by = ''): array {
bool $skip_first_id_check, string $order_by): array {
$disable_cache = false;

2
classes/pref/system.php
View File

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