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-02-05 11:50:02 +03:00
parent 6738f5c86b a7d6ead956
commit 079f6dfdd0
3 changed files with 3 additions and 3 deletions
Show Stats 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") { if ($check == "version") {
$rv["version"] = strftime("%y.%m", (int)$timestamp) . "-$commit"; $rv["version"] = date("y.m", (int)$timestamp) . "-$commit";
$rv["commit"] = $commit; $rv["commit"] = $commit;
$rv["timestamp"] = $timestamp; $rv["timestamp"] = $timestamp;

2
classes/debug.php
View File

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

2
classes/rssutils.php
View File

@ -921,7 +921,7 @@ class RSSUtils {
$entry_timestamp = time(); $entry_timestamp = time();
} }
$entry_timestamp_fmt = strftime("%Y/%m/%d %H:%M:%S", $entry_timestamp); $entry_timestamp_fmt = date("Y/m/d H:i:s", $entry_timestamp);
Debug::log("date: $entry_timestamp ($entry_timestamp_fmt)", Debug::LOG_VERBOSE); Debug::log("date: $entry_timestamp ($entry_timestamp_fmt)", Debug::LOG_VERBOSE);
Debug::log("num_comments: $num_comments", Debug::LOG_VERBOSE); Debug::log("num_comments: $num_comments", Debug::LOG_VERBOSE);