From 3b68240174de616a2217b40b739a548c9b0b4bc0 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 5 May 2016 10:36:18 +0100 Subject: [PATCH 1/5] Change proposal of forum description Changed proposal to parse embeded shortcodes on the forum description, if any present.... --- e107_plugins/forum/forum.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 6013f0fc3..7249e80f5 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -411,7 +411,7 @@ function parse_forum($f, $restricted_string = '') //$url= $e107->url->create('forum/forum/view', $f); $url = e107::url('forum', 'forum', $f); $fVars->FORUMNAME = "{$f['forum_name']}"; - $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? "
$restricted_string" : ""); + $fVars->FORUMDESCRIPTION = e107::getParser()->toHTML($f['forum_description'].($restricted_string ? "
$restricted_string" : ""), TRUE, "TITLE"); $fVars->THREADS = $f['forum_threads']; $fVars->REPLIES = $f['forum_replies']; $fVars->FORUMSUBFORUMS = ''; @@ -775,4 +775,4 @@ function forum_track() } -?> \ No newline at end of file +?> From 2adc6b9668814300bcf5046901c206e6d182dc06 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 5 May 2016 10:41:20 +0100 Subject: [PATCH 2/5] Update forum.php --- e107_plugins/forum/forum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 7249e80f5..8efcd3063 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -411,7 +411,7 @@ function parse_forum($f, $restricted_string = '') //$url= $e107->url->create('forum/forum/view', $f); $url = e107::url('forum', 'forum', $f); $fVars->FORUMNAME = "{$f['forum_name']}"; - $fVars->FORUMDESCRIPTION = e107::getParser()->toHTML($f['forum_description'].($restricted_string ? "
$restricted_string" : ""), TRUE, "TITLE"); + $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? e107::getParser()->toHTML("
$restricted_string", TRUE, "TITLE") : ""); $fVars->THREADS = $f['forum_threads']; $fVars->REPLIES = $f['forum_replies']; $fVars->FORUMSUBFORUMS = ''; From f398f3631d9c6cc5202cca529ca1be73c6f072a0 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 5 May 2016 11:11:50 +0100 Subject: [PATCH 3/5] Update forum.php --- e107_plugins/forum/forum.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 8efcd3063..999bd2244 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -405,14 +405,13 @@ function parse_forum($f, $restricted_string = '') $f['forum_name'] = substr($f['forum_name'], 1); } $f['forum_name'] = $tp->toHTML($f['forum_name'], true, 'no_hook'); - $f['forum_description'] = $tp->toHTML($f['forum_description'], true, 'no_hook'); + $f['forum_description'] = $tp->toHTML($f['forum_description'], TRUE, "TITLE"); //$url= $e107->url->create('forum/forum/view', $f); $url = e107::url('forum', 'forum', $f); $fVars->FORUMNAME = "{$f['forum_name']}"; - $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? e107::getParser()->toHTML("
$restricted_string", TRUE, "TITLE") : ""); - $fVars->THREADS = $f['forum_threads']; + $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? "
$restricted_string" : ""); $fVars->THREADS = $f['forum_threads']; $fVars->REPLIES = $f['forum_replies']; $fVars->FORUMSUBFORUMS = ''; From 652fc64752eefb3c7006aa65523511126e5614dd Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 5 May 2016 11:13:06 +0100 Subject: [PATCH 4/5] Update forum.php --- e107_plugins/forum/forum.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 999bd2244..0c031524b 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -411,7 +411,8 @@ function parse_forum($f, $restricted_string = '') //$url= $e107->url->create('forum/forum/view', $f); $url = e107::url('forum', 'forum', $f); $fVars->FORUMNAME = "{$f['forum_name']}"; - $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? "
$restricted_string" : ""); $fVars->THREADS = $f['forum_threads']; + $fVars->FORUMDESCRIPTION = $f['forum_description'].($restricted_string ? "
$restricted_string" : ""); + $fVars->THREADS = $f['forum_threads']; $fVars->REPLIES = $f['forum_replies']; $fVars->FORUMSUBFORUMS = ''; From 947f06987e1414dd9009ad71dbf6ce8d47d51ffe Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 5 May 2016 20:24:34 +0100 Subject: [PATCH 5/5] Update forum.php --- e107_plugins/forum/forum.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index 0c031524b..1e62d77f4 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -405,7 +405,7 @@ function parse_forum($f, $restricted_string = '') $f['forum_name'] = substr($f['forum_name'], 1); } $f['forum_name'] = $tp->toHTML($f['forum_name'], true, 'no_hook'); - $f['forum_description'] = $tp->toHTML($f['forum_description'], TRUE, "TITLE"); + $f['forum_description'] = $tp->toHTML($f['forum_description'], TRUE, "BODY"); //$url= $e107->url->create('forum/forum/view', $f);