diff --git a/Blacklight/libraries/Forking.php b/Blacklight/libraries/Forking.php index 5dab23059..ebe568416 100755 --- a/Blacklight/libraries/Forking.php +++ b/Blacklight/libraries/Forking.php @@ -203,7 +203,7 @@ class Forking extends \fork_daemon if (config('nntmux.echocli')) { $this->colorCli->header( 'Multi-processing for '.$this->workType.' finished in '.(now()->timestamp - $startTime). - ' seconds at '.date(DATE_RFC2822).'.'.PHP_EOL + ' seconds at '.now()->toRfc2822String().'.'.PHP_EOL ); } } @@ -294,7 +294,7 @@ class Forking extends \fork_daemon if ($this->_workCount > 0) { if (config('nntmux.echocli') === true) { $this->colorCli->header( - 'Multi-processing started at '.date(DATE_RFC2822).' for '.$this->workType.' with '.$this->_workCount. + 'Multi-processing started at '.now()->toRfc2822String().' for '.$this->workType.' with '.$this->_workCount. ' job(s) to do using a max of '.$this->maxProcesses.' child process(es).' ); } @@ -525,7 +525,8 @@ class Forking extends \fork_daemon SELECT g.name AS groupname, g.last_record AS our_last, a.last_record AS their_last FROM usenet_groups g - INNER JOIN short_groups a ON g.active = 1 AND g.name = a.name + INNER JOIN short_groups a ON g.ac + tive = 1 AND g.name = a.name ORDER BY a.last_record DESC' ); diff --git a/Blacklight/libraries/ForkingImportNZB.php b/Blacklight/libraries/ForkingImportNZB.php index b408f9eb4..5a80c166c 100755 --- a/Blacklight/libraries/ForkingImportNZB.php +++ b/Blacklight/libraries/ForkingImportNZB.php @@ -67,7 +67,7 @@ class ForkingImportNZB extends Forking if (config('nntmux.echocli')) { $this->colorCli->header( - 'Multi-processing started at '.date(DATE_RFC2822).' with '.$this->_workCount. + 'Multi-processing started at '.now()->toRfc2822String().' with '.$this->_workCount. ' job(s) to do using a max of '.$maxProcesses.' child process(es).' ); } @@ -86,7 +86,7 @@ class ForkingImportNZB extends Forking if (config('nntmux.echocli')) { $this->colorCli->header( 'Multi-processing for import finished in '.(now()->timestamp - $startTime). - ' seconds at '.date(DATE_RFC2822).'.'.PHP_EOL + ' seconds at '.now()->toRfc2822String().'.'.PHP_EOL ); } } diff --git a/Changelog b/Changelog index 189673f0b..c99cb43b4 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-04-01 DariusIII + * CHg: Use now() helper in Forking date display * Chg: Update used libraries to their latest versions 2019-03-22 DariusIII * Chg: Update symfony components