aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authornatec <natec@users.sourceforge.net>2001-03-21 07:17:11 +0000
committernatec <natec@users.sourceforge.net>2001-03-21 07:17:11 +0000
commitbf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e (patch)
tree593e89e9080cf61655ae8164ea676d4244e0e5e1 /phpBB/viewtopic.php
parente4380fff1dff408fbad1e590d902c629865062f4 (diff)
downloadforums-bf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e.tar
forums-bf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e.tar.gz
forums-bf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e.tar.bz2
forums-bf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e.tar.xz
forums-bf7ec7c8f01d84c6ed93474c4ac898acf9af3e6e.zip
v2 BBcode now being used.. run bbcode_conversion.php to convert your database. It WILL make a backup posts_text table.
git-svn-id: file:///svn/phpbb/trunk@114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 97a47d82b4..a56c0288bf 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -22,6 +22,7 @@
***************************************************************************/
include('extension.inc');
include('common.'.$phpEx);
+include('functions/bbcode.'.$phpEx);
if(!isset($HTTP_GET_VARS['topic'])) // For backward compatibility
{
@@ -84,7 +85,7 @@ if(!isset($start))
$start = 0;
}
-$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, r.rank_title, r.rank_image, p.post_time, p.post_id, pt.post_text
+$sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, r.rank_title, r.rank_image, p.post_time, p.post_id, p.bbcode_uid, pt.post_text
FROM ".POSTS_TABLE." p
LEFT JOIN ".USERS_TABLE." u ON p.poster_id = u.user_id
LEFT JOIN ".RANKS_TABLE." r ON (u.user_rank = r.rank_id)
@@ -146,6 +147,7 @@ for($x = 0; $x < $total_posts; $x++)
}
$message = stripslashes($postrow[$x]["post_text"]);
+ $bbcode_uid = $postrow[$x]['bbcode_uid'];
if(!$allow_html)
{
@@ -154,8 +156,11 @@ for($x = 0; $x < $total_posts; $x++)
if($allow_bbcode)
{
// do bbcode stuff here
+ $message = bbencode_second_pass($message, $bbcode_uid);
}
+ $message = str_replace("\n", "<BR>", $message);
+
if(!($x % 2))
{
$color = "#DDDDDD";