 -	global $pun_config, $lang_common, $pun_user;
 +	global $pun_config, $cur_post;
 +	static $textile = null;
-
+ 
  	if ($pun_config['o_censoring'] == '1')
 +	{
  		$text = censor_words($text);
 +	}
-
+ 
 -	// Convert applicable characters to HTML entities
 -	$text = pun_htmlspecialchars($text);
 -

+	{
+		return $textile->textileRestricted($text, false, true);
+	}

-	return clean_paragraphs($text);
+	return $textile->textileRestricted($text, false, false);
 }
diff --git a/lang/English/profile.php b/lang/English/profile.php
index c9e63c2..4b54b4f 100644
--- a/lang/English/profile.php
+++ b/lang/English/profile.php
@@ -95,7 +95,7 @@ $lang_profile = array(

 'Sig preview'					=>	'Current signature preview:',
 'No sig'						=>	'No signature currently stored in profile.',
 'Signature quote/code/list/h'	=>	'The quote, code, list, and heading BBCodes are not allowed in signatures.',
diff --git a/viewforum.php b/viewforum.php
index 2607a21..c545b0c 100644
--- a/viewforum.php
+++ b/viewforum.php
@@ -80,14 +80,14 @@ $paging_links = '<span class="pages-label">'.$lang_common['Pages'].' </span>'.pa
 
 // Add relationship meta tags
 $page_head = array();
-$page_head['canonical'] = '<link rel="canonical" href="viewforum.php?id='.$id.($p == 1 ? '' : '&amp;p='.$p).'" title="'.sprintf($lang_common['Page'], $p).'" />';
+$page_head['canonical'] = '<link rel="canonical" href="http://forum.textpattern.com/viewforum.php?id='.$id.($p == 1 ? '' : '&amp;p='.$p).'" title="'.sprintf($lang_common['Page'], $p).'" />';
 
 if ($num_pages > 1)
 {
 	if ($p > 1)
-		$page_head['prev'] = '<link rel="prev" href="viewforum.php?id='.$id.($p == 2 ? '' : '&amp;p='.($p - 1)).'" title="'.sprintf($lang_common['Page'], $p - 1).'" />';
+		$page_head['prev'] = '<link rel="prev" href="http://forum.textpattern.com/viewforum.php?id='.$id.($p == 2 ? '' : '&amp;p='.($p - 1)).'" title="'.sprintf($lang_common['Page'], $p - 1).'" />';
 	if ($p < $num_pages)
-		$page_head['next'] = '<link rel="next" href="viewforum.php?id='.$id.'&amp;p='.($p + 1).'" title="'.sprintf($lang_common['Page'], $p + 1).'" />';
+		$page_head['next'] = '<link rel="next" href="http://forum.textpattern.com/viewforum.php?id='.$id.'&amp;p='.($p + 1).'" title="'.sprintf($lang_common['Page'], $p + 1).'" />';
 }
 
 if ($pun_config['o_feed_type'] == '1')
diff --git a/viewtopic.php b/viewtopic.php
index 618b699..4f8d7c1 100644
--- a/viewtopic.php
+++ b/viewtopic.php
@@ -171,14 +171,14 @@ else
 
 // Add relationship meta tags
 $page_head = array();
-$page_head['canonical'] = '<link rel="canonical" href="viewtopic.php?id='.$id.($p == 1 ? '' : '&amp;p='.$p).'" title="'.sprintf($lang_common['Page'], $p).'" />';
+$page_head['canonical'] = '<link rel="canonical" href="http://forum.textpattern.com/viewtopic.php?id='.$id.($p == 1 ? '' : '&amp;p='.$p).'" title="'.sprintf($lang_common['Page'], $p).'" />';
 
 if ($num_pages > 1)
 {
 	if ($p > 1)
-		$page_head['prev'] = '<link rel="prev" href="viewtopic.php?id='.$id.($p == 2 ? '' : '&amp;p='.($p - 1)).'" title="'.sprintf($lang_common['Page'], $p - 1).'" />';
+		$page_head['prev'] = '<link rel="prev" href="http://forum.textpattern.com/viewtopic.php?id='.$id.($p == 2 ? '' : '&amp;p='.($p - 1)).'" title="'.sprintf($lang_common['Page'], $p - 1).'" />';
 	if ($p < $num_pages)
-		$page_head['next'] = '<link rel="next" href="viewtopic.php?id='.$id.'&amp;p='.($p + 1).'" title="'.sprintf($lang_common['Page'], $p + 1).'" />';
+		$page_head['next'] = '<link rel="next" href="http://forum.textpattern.com/viewtopic.php?id='.$id.'&amp;p='.($p + 1).'" title="'.sprintf($lang_common['Page'], $p + 1).'" />';
 }
 
 if ($pun_config['o_feed_type'] == '1')
