Move Temporal::convert() to DateTimeFormat::convert()

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 884b91393bf4ad423cb82820486569ab3c979a3b..f1c895f90fece19a2aac720a9d5fa1835c8b4b0b 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2,26 +2,19 @@
 /**
  * @file include/items.php
  */
-use Friendica\App;
+
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Core\Worker;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
-use Friendica\Model\Contact;
-use Friendica\Model\GContact;
-use Friendica\Model\Group;
-use Friendica\Model\Term;
-use Friendica\Model\User;
 use Friendica\Model\Item;
-use Friendica\Model\Conversation;
-use Friendica\Object\Image;
 use Friendica\Protocol\DFRN;
-use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\OStatus;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\ParseUrl;
 
@@ -415,7 +408,7 @@ function drop_item($id) {
 
 /* arrange the list in years */
 function list_post_dates($uid, $wall) {
-       $dnow = datetime_convert('',date_default_timezone_get(), 'now','Y-m-d');
+       $dnow = DateTimeFormat::localNow('Y-m-d');
 
        $dthen = Item::firstPostDate($uid, $wall);
        if (!$dthen) {
@@ -436,14 +429,14 @@ function list_post_dates($uid, $wall) {
                $dyear = intval(substr($dnow, 0, 4));
                $dstart = substr($dnow, 0, 8) . '01';
                $dend = substr($dnow, 0, 8) . get_dim(intval($dnow), intval(substr($dnow, 5)));
-               $start_month = datetime_convert('', '', $dstart, 'Y-m-d');
-               $end_month = datetime_convert('', '', $dend, 'Y-m-d');
-               $str = day_translate(datetime_convert('', '', $dnow, 'F'));
+               $start_month = DateTimeFormat::utc($dstart, 'Y-m-d');
+               $end_month = DateTimeFormat::utc($dend, 'Y-m-d');
+               $str = day_translate(DateTimeFormat::utc($dnow, 'F'));
                if (!$ret[$dyear]) {
                        $ret[$dyear] = [];
                }
                $ret[$dyear][] = [$str, $end_month, $start_month];
-               $dnow = datetime_convert('', '', $dnow . ' -1 month', 'Y-m-d');
+               $dnow = DateTimeFormat::utc($dnow . ' -1 month', 'Y-m-d');
        }
        return $ret;
 }
@@ -473,7 +466,7 @@ function posted_date_widget($url, $uid, $wall) {
                return $o;
        }
 
-       $cutoff_year = intval(datetime_convert('',date_default_timezone_get(), 'now', 'Y')) - $visible_years;
+       $cutoff_year = intval(DateTimeFormat::localNow('Y')) - $visible_years;
        $cutoff = ((array_key_exists($cutoff_year, $ret))? true : false);
 
        $o = replace_macros(get_markup_template('posted_date_widget.tpl'),[