From 7d5b2ceba423c42cc9a5da2e6617fddc6d32298f Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sun, 4 Dec 2016 15:41:52 +0000 Subject: [PATCH 1/6] Update forum_post_template.php --- e107_plugins/forum/templates/forum_post_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php index 86361230a..2d941c678 100644 --- a/e107_plugins/forum/templates/forum_post_template.php +++ b/e107_plugins/forum/templates/forum_post_template.php @@ -12,7 +12,7 @@ if (!defined('e107_INIT')) { exit; } // New in v2.x - requires a bootstrap theme be loaded. -//$FORUM_POST_TEMPLATE['caption'] = "Custom caption"; +//$FORUM_POST_TEMPLATE['caption'] = "{FORUM_POST_CAPTIONNAME}"; $FORUM_POST_TEMPLATE['form'] = " {FORUM_POST_FORM_START}
From cc747a7e5343c0f60d54402ad9b8028c1d234a06 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sun, 4 Dec 2016 15:42:59 +0000 Subject: [PATCH 2/6] Update post_shortcodes.php --- .../shortcodes/batch/post_shortcodes.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index e53d92506..2cd2f2f86 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -434,6 +434,29 @@ class plugin_forum_post_shortcodes extends e_shortcode return $_tmp['breadcrumb']; } + function sc_forum_post_captionname() + { +// global $forumInfo; + $tp = e107::getParser(); +// var_dump ($this); +//$this->forumObj->threadGet($this->id, false) + if ($this->var['action'] == "rp") + { + $pre = LAN_FORUM_1003; + $name = strip_tags($tp->toHTML($this->var['thread_name'], false, 'no_hook, emotes_off')); + $url = e107::url('forum', 'topic', $this->var); + $post = LAN_FORUM_2006; + } + if ($this->var['action'] == "nt") + { + $pre = LAN_FORUM_1001; + $name = strip_tags($tp->toHTML($this->var['forum_name'], false, 'no_hook, emotes_off')); + $url = e107::url('forum', 'forum', $this->var); + $post = LAN_FORUM_2005; + } + return $pre.($url?": {$name} - ":$name).$post; + } + function sc_noemotes() { if(vartrue($eaction) == true) { return null; } From 7df9a5816f02770ea18d75ad0c47939f83bac795 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Wed, 7 Dec 2016 17:45:43 +0000 Subject: [PATCH 3/6] Update post_shortcodes.php --- .../forum/shortcodes/batch/post_shortcodes.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index 2cd2f2f86..6593f2925 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -442,17 +442,17 @@ class plugin_forum_post_shortcodes extends e_shortcode //$this->forumObj->threadGet($this->id, false) if ($this->var['action'] == "rp") { - $pre = LAN_FORUM_1003; - $name = strip_tags($tp->toHTML($this->var['thread_name'], false, 'no_hook, emotes_off')); - $url = e107::url('forum', 'topic', $this->var); - $post = LAN_FORUM_2006; + $pre = LAN_FORUM_1003; + $name = $this->var['thread_name']; + $url = e107::url('forum', 'topic', $this->var); + $post = LAN_FORUM_2006; } if ($this->var['action'] == "nt") { - $pre = LAN_FORUM_1001; - $name = strip_tags($tp->toHTML($this->var['forum_name'], false, 'no_hook, emotes_off')); - $url = e107::url('forum', 'forum', $this->var); - $post = LAN_FORUM_2005; + $pre = LAN_FORUM_1001; + $name = $this->var['forum_name']; + $url = e107::url('forum', 'forum', $this->var); + $post = LAN_FORUM_2005; } return $pre.($url?": {$name} - ":$name).$post; } From 2ec9b39d8100413797e6504c2889275fb0c0bcd5 Mon Sep 17 00:00:00 2001 From: rica-carv Date: Sat, 7 Jan 2017 20:57:16 +0000 Subject: [PATCH 4/6] Update post_shortcodes.php --- e107_plugins/forum/shortcodes/batch/post_shortcodes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index 6593f2925..5bad703c7 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -443,14 +443,14 @@ class plugin_forum_post_shortcodes extends e_shortcode if ($this->var['action'] == "rp") { $pre = LAN_FORUM_1003; - $name = $this->var['thread_name']; + $name = $tp->toHTML($this->var['thread_name'], false, 'no_hook, emotes_off'); $url = e107::url('forum', 'topic', $this->var); $post = LAN_FORUM_2006; } if ($this->var['action'] == "nt") { $pre = LAN_FORUM_1001; - $name = $this->var['forum_name']; + $name = $tp->toHTML($this->var['forum_name'], false, 'no_hook, emotes_off'); $url = e107::url('forum', 'forum', $this->var); $post = LAN_FORUM_2005; } From 4d35059afe8cf90d68a368cd0ae99a15fd4c587a Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 12 Jan 2017 18:13:39 +0000 Subject: [PATCH 5/6] Update post_shortcodes.php --- e107_plugins/forum/shortcodes/batch/post_shortcodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index 5bad703c7..e2238ee55 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -434,7 +434,7 @@ class plugin_forum_post_shortcodes extends e_shortcode return $_tmp['breadcrumb']; } - function sc_forum_post_captionname() + function sc_forum_post_caption() { // global $forumInfo; $tp = e107::getParser(); From 9070238ae66318e2e4d234dec8dffce62095e71c Mon Sep 17 00:00:00 2001 From: rica-carv Date: Thu, 12 Jan 2017 18:14:11 +0000 Subject: [PATCH 6/6] Update forum_post_template.php --- e107_plugins/forum/templates/forum_post_template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/forum/templates/forum_post_template.php b/e107_plugins/forum/templates/forum_post_template.php index 2d941c678..faf8c055d 100644 --- a/e107_plugins/forum/templates/forum_post_template.php +++ b/e107_plugins/forum/templates/forum_post_template.php @@ -12,7 +12,7 @@ if (!defined('e107_INIT')) { exit; } // New in v2.x - requires a bootstrap theme be loaded. -//$FORUM_POST_TEMPLATE['caption'] = "{FORUM_POST_CAPTIONNAME}"; +//$FORUM_POST_TEMPLATE['caption'] = "{FORUM_POST_CAPTION}"; $FORUM_POST_TEMPLATE['form'] = " {FORUM_POST_FORM_START}