diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
| commit | c7d29fbdb1bb0d265e7791ce40699def97f4388e (patch) | |
| tree | e8ec269bdf1022b59dbebd101932ebb1db361648 /phpBB/phpbb/feed/post_base.php | |
| parent | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (diff) | |
| parent | 717f8a6671a216b4d9985c286454b47cd9cb8691 (diff) | |
| download | forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.gz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.bz2 forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.xz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.zip | |
Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds
* Nicofuma/ticket/12459:
[ticket/12459] Change language strings
[ticket/12459] Enable related tests
[ticket/12459] Fix: Differentiating unapproved and deleted posts
[ticket/12459] Fix: Soft deleted topics should appear in feeds
[ticket/12459] Fix: the posts were always marked as unapproved
Diffstat (limited to 'phpBB/phpbb/feed/post_base.php')
| -rw-r--r-- | phpBB/phpbb/feed/post_base.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php index de98f446f3..cfcd8671a3 100644 --- a/phpBB/phpbb/feed/post_base.php +++ b/phpBB/phpbb/feed/post_base.php @@ -46,7 +46,8 @@ abstract class post_base extends \phpbb\feed\attachments_base { $item_row['statistics'] = $this->user->lang['POSTED'] . ' ' . $this->user->lang['POST_BY_AUTHOR'] . ' ' . $this->user_viewprofile($row) . ' ' . $this->separator_stats . ' ' . $this->user->format_date($row[$this->get('published')]) - . (($this->is_moderator_approve_forum($row['forum_id']) && $row['post_visibility'] !== ITEM_APPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : ''); + . (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_UNAPPROVED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_UNAPPROVED'] : '') + . (($this->is_moderator_approve_forum($row['forum_id']) && (int)$row['post_visibility'] === ITEM_DELETED) ? ' ' . $this->separator_stats . ' ' . $this->user->lang['POST_DELETED'] : ''); } } } |