bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #2762 from annando/1609-tagged

Browse source 
The "tagged with" message now works again.
This commit is contained in:
rabuzarus 2016-09-03 13:06:43 +02:00 committed by GitHub
commit eec626f6bf
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/conversation.php
View file

@ -425,7 +425,7 @@ These Fields are not added below (yet). They are here to for bug search.
`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`, `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
`item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`, `item`.`title`, `item`.`body`, `item`.`file`, `item`.`event-id`,
`item`.`location`, `item`.`coord`, `item`.`app`, `item`.`location`, `item`.`coord`, `item`.`app`,
`item`.`rendered-hash`, `item`.`rendered-html`, `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`, `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
`item`.`id` AS `item_id`, `item`.`network` AS `item_network`, `item`.`id` AS `item_id`, `item`.`network` AS `item_network`,

24
object/Item.php
View file

@ -89,14 +89,14 @@ class Item extends BaseObject {
$a = $this->get_app(); $a = $this->get_app();
$item = $this->get_data(); $item = $this->get_data();
$edited = false; $edited = false;
if (strcmp($item['created'], $item['edited'])<>0) { if (strcmp($item['created'], $item['edited'])<>0) {
$edited = array( $edited = array(
'label' => t('This entry was edited'), 'label' => t('This entry was edited'),
'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'), 'date' => datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r'),
'relative' => relative_date($item['edited']) 'relative' => relative_date($item['edited'])
); );
} }
$commentww = ''; $commentww = '';
$sparkle = ''; $sparkle = '';
$buttons = ''; $buttons = '';
@ -439,10 +439,10 @@ class Item extends BaseObject {
} }
} }
if ($this->is_toplevel()) { if ($this->is_toplevel()) {
$result['total_comments_num'] = "$total_children"; $result['total_comments_num'] = "$total_children";
$result['total_comments_text'] = tt('comment', 'comments', $total_children); $result['total_comments_text'] = tt('comment', 'comments', $total_children);
} }
$result['private'] = $item['private']; $result['private'] = $item['private'];
$result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : ''); $result['toplevel'] = ($this->is_toplevel() ? 'toplevel_item' : '');