Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 06:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace remaining functions in include/datetime by Temporal methods

Browse source 
- Fix uses statements
This commit is contained in:
Hypolite Petovan 2018-02-03 12:25:58 -05:00
parent d0c9e7939c
commit cea80c78e4
20 changed files with 60 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/conversation.php
View file

@ -15,9 +15,10 @@ use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Object\Post;
use Friendica\Util\XML;
use Friendica\Object\Thread;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
require_once "include/bbcode.php";
require_once "include/acl_selectors.php";
@ -791,7 +792,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
'folders' => $folders,
'text' => strip_tags($body_e),
'localtime' => DateTimeFormat::local($item['created'], 'r'),
'ago' => (($item['app']) ? L10n::t('%s from %s', relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'ago' => (($item['app']) ? L10n::t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
'location' => $location_e,
'indent' => '',
'owner_name' => $owner_name_e,
@ -1166,7 +1167,7 @@ function builtin_activity_puller($item, &$conv_responses) {
* @param array $arr = array of pre-linked names of likers/dislikers
* @param string $type = one of 'like, 'dislike', 'attendyes', 'attendno', 'attendmaybe'
* @param int $id = item id
* @return formatted text
* @return string formatted text
*/
function format_like($cnt, array $arr, $type, $id) {
$o = '';