diff options
| author | Andrew Dolgov <[email protected]> | 2022-02-05 11:50:02 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2022-02-05 11:50:02 +0300 |
| commit | 079f6dfdd0a26e9ba68aff6f05072d1720f6a6af (patch) | |
| tree | 233198f22220c7d91d396cccfe8e052197145d9a /classes | |
| parent | 6738f5c86beb841e30548dafaed45fc2850f619d (diff) | |
| parent | a7d6ead956784152423b3bae75b46631f5f108c4 (diff) | |
Merge branch 'master' of git.tt-rss.org:fox/tt-rss
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/config.php | 2 | ||||
| -rw-r--r-- | classes/debug.php | 2 | ||||
| -rwxr-xr-x | classes/rssutils.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/classes/config.php b/classes/config.php index 2c78b908d..2f151566f 100644 --- a/classes/config.php +++ b/classes/config.php @@ -359,7 +359,7 @@ class Config { if ($check == "version") { - $rv["version"] = strftime("%y.%m", (int)$timestamp) . "-$commit"; + $rv["version"] = date("y.m", (int)$timestamp) . "-$commit"; $rv["commit"] = $commit; $rv["timestamp"] = $timestamp; diff --git a/classes/debug.php b/classes/debug.php index e20126b86..fbdf260e0 100644 --- a/classes/debug.php +++ b/classes/debug.php @@ -88,7 +88,7 @@ class Debug { 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')) { $ts = "$ts/" . posix_getpid(); } diff --git a/classes/rssutils.php b/classes/rssutils.php index 6f1d52c05..d7284a7bc 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -921,7 +921,7 @@ class RSSUtils { $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("num_comments: $num_comments", Debug::LOG_VERBOSE); |