Merge https://github.com/friendica/red into pending_merge

2015-01-14 18:37:28 -08:00
parent 168b67fa41 b37915a40e
commit 2e89c13229
5 changed files with 105 additions and 1 deletions
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -575,6 +575,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	if (strpos($Text,'[h6]') !== false) {
 		$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
 	}
+	// Check for table of content
+	if (strpos($Text,'[toc]') !== false) {
+		$Text = preg_replace("/\[toc\]/ism",'<ul id="toc"></ul>',$Text);
+	}
 	// Check for centered text
 	if (strpos($Text,'[/center]') !== false) {	
 	$Text = preg_replace("(\[center\](.*?)\[\/center\])ism","<div style=\"text-align:center;\">$1</div>",$Text);