aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/feed.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-11-24 16:00:18 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-11-24 16:00:18 +0000
commit2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467 (patch)
tree6d241f4e946cb810ad282a11e3ef25ab55001f24 /phpBB/feed.php
parenta019b157465834b52dac10bf5e2a8a5c4001713c (diff)
downloadforums-2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467.tar
forums-2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467.tar.gz
forums-2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467.tar.bz2
forums-2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467.tar.xz
forums-2d83f5be708d650b5c5ffa1ddb0a0d8ffad62467.zip
Bug #53565 - Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10285 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/feed.php')
-rw-r--r--phpBB/feed.php23
1 files changed, 19 insertions, 4 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php
index cbc7cb60d1..dfa584956c 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -439,6 +439,11 @@ class phpbb_feed
var $separator = "\xE2\x80\xA2"; // &bull;
/**
+ * Separator for the statistics row (Posted by, post date, replies, etc.)
+ */
+ var $separator_stats = "\xE2\x80\x94"; // &mdash;
+
+/**
* Constructor. Set standard keys.
*/
function phpbb_feed($forum_id = 0, $topic_id = 0)
@@ -811,7 +816,10 @@ class phpbb_feed
$time = ($this->topic_id) ? $row['post_time'] : $row['topic_time'];
- $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link . ' - ' . $user->format_date($time). ' - ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies'] . ' - ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
+ $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link
+ . ' ' . $this->separator_stats . ' ' . $user->format_date($time)
+ . ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies']
+ . ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
}
}
}
@@ -867,7 +875,8 @@ class phpbb_feed_forums extends phpbb_feed
{
global $user;
- $item_row['statistics'] = sprintf($user->lang['TOTAL_TOPICS_OTHER'], $row['forum_topics']) . ' - ' . sprintf($user->lang['TOTAL_POSTS_OTHER'], $row['forum_posts']);
+ $item_row['statistics'] = sprintf($user->lang['TOTAL_TOPICS_OTHER'], $row['forum_topics'])
+ . ' ' . $this->separator_stats . ' ' . sprintf($user->lang['TOTAL_POSTS_OTHER'], $row['forum_posts']);
}
}
}
@@ -958,7 +967,10 @@ class phpbb_feed_news extends phpbb_feed
$user_link = '<a href="' . feed_append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $row[$this->get('author_id')]) . '">' . $row[$this->get('creator')] . '</a>';
- $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link . ' - ' . $user->format_date($row['topic_time']). ' - ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies'] . ' - ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
+ $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link
+ . ' ' . $this->separator_stats . ' ' . $user->format_date($row['topic_time'])
+ . ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies']
+ . ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
}
}
}
@@ -1056,7 +1068,10 @@ class phpbb_feed_topics extends phpbb_feed
$user_link = '<a href="' . feed_append_sid('/memberlist.' . $phpEx, 'mode=viewprofile&amp;u=' . $row[$this->get('author_id')]) . '">' . $row[$this->get('creator')] . '</a>';
- $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link . ' - ' . $user->format_date($row['topic_time']). ' - ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies'] . ' - ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
+ $item_row['statistics'] = $user->lang['POSTED'] . ' ' . $user->lang['POST_BY_AUTHOR'] . ' ' . $user_link
+ . ' ' . $this->separator_stats . ' ' . $user->format_date($row['topic_time'])
+ . ' ' . $this->separator_stats . ' ' . $user->lang['REPLIES'] . ' ' . $row['topic_replies']
+ . ' ' . $this->separator_stats . ' ' . $user->lang['VIEWS'] . ' ' . $row['topic_views'];
}
}
}