Merge pull request #4533 from tobiasd/20180303-typo

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index c27cd7c49c5ccfbd2bbb1dcc6eae0f2706be91b9..0728020eccab3292e6cc7428b616bc5b80bed149 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -3,12 +3,15 @@
 // See here for a documentation for portable contacts:
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
+
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 
 function poco_init(App $a) {
        $system_mode = false;
@@ -43,7 +46,7 @@ function poco_init(App $a) {
        if ($a->argc > 1 && $a->argv[1] === '@global') {
                // List of all profiles that this server recently had data from
                $global = true;
-               $update_limit = date("Y-m-d H:i:s", time() - 30 * 86400);
+               $update_limit = date(DateTimeFormat::MYSQL, time() - 30 * 86400);
        }
        if ($a->argc > 2 && $a->argv[2] === '@me') {
                $justme = true;
@@ -80,7 +83,7 @@ function poco_init(App $a) {
                $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
        }
        if (x($_GET, 'updatedSince')) {
-               $update_limit = date("Y-m-d H:i:s", strtotime($_GET['updatedSince']));
+               $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
        }
        if ($global) {
                $contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
@@ -243,8 +246,7 @@ function poco_init(App $a) {
                                }
                                $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
                                if (is_null($about)) {
-                                       require_once 'include/bbcode.php';
-                                       $about = bbcode($contact['about'], false, false);
+                                       $about = BBCode::convert($contact['about'], false);
                                        Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
                                }