diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 22:24:59 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-06-16 22:24:59 +0200 |
| commit | 7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00 (patch) | |
| tree | 1649bd0943b407c83b4d5430af11f4eee5b452d1 /phpBB/phpbb/feed | |
| parent | 58fd91dde105a0755e906452842f635770f8dd23 (diff) | |
| parent | 4d6afb26380d192efc556640499b6f5c43fbdf3c (diff) | |
| download | forums-7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00.tar forums-7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00.tar.gz forums-7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00.tar.bz2 forums-7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00.tar.xz forums-7f5aeeef012dcd9b5492e7eaebbbb3e56b5a3d00.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy ruleset
Diffstat (limited to 'phpBB/phpbb/feed')
| -rw-r--r-- | phpBB/phpbb/feed/post_base.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/feed/topic_base.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/feed/post_base.php b/phpBB/phpbb/feed/post_base.php index fe11fd2a79..011775b6af 100644 --- a/phpBB/phpbb/feed/post_base.php +++ b/phpBB/phpbb/feed/post_base.php @@ -48,8 +48,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']) && (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'] : ''); + . (($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'] : ''); } } } diff --git a/phpBB/phpbb/feed/topic_base.php b/phpBB/phpbb/feed/topic_base.php index 4fbb498272..f9ff368cba 100644 --- a/phpBB/phpbb/feed/topic_base.php +++ b/phpBB/phpbb/feed/topic_base.php @@ -52,11 +52,11 @@ abstract class topic_base extends \phpbb\feed\attachments_base if ($this->is_moderator_approve_forum($row['forum_id'])) { - if ( (int)$row['topic_visibility'] === ITEM_DELETED) + if ((int) $row['topic_visibility'] === ITEM_DELETED) { $item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_DELETED']; } - else if ((int)$row['topic_visibility'] === ITEM_UNAPPROVED) + else if ((int) $row['topic_visibility'] === ITEM_UNAPPROVED) { $item_row['statistics'] .= ' ' . $this->separator_stats . ' ' . $this->user->lang['TOPIC_UNAPPROVED']; } |