From b05785dd0199d0644d56ce72e51d032ef808fe98 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 4 May 2016 09:25:44 -0700 Subject: [PATCH] Forum: Added missing breadcrumbs to report and move pages. --- e107_plugins/forum/forum_class.php | 4 ++-- e107_plugins/forum/forum_post.php | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/e107_plugins/forum/forum_class.php b/e107_plugins/forum/forum_class.php index 0c0b9c9ca..3b4d10250 100644 --- a/e107_plugins/forum/forum_class.php +++ b/e107_plugins/forum/forum_class.php @@ -507,7 +507,7 @@ class e107forum { if($tmp = e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->retrieve('forum_perms')) { - e107::getMessage()->addDebug("Using Permlist cache: True"); + e107::getDebug()->log("Using Permlist cache: True"); $this->permList = e107::unserialize($tmp); @@ -516,7 +516,7 @@ class e107forum } else { - e107::getMessage()->addDebug("Using Permlist cache: False"); + e107::getDebug()->log("Using Permlist cache: False"); $this->_getForumPermList(); $tmp = e107::serialize($this->permList, false); e107::getCache()->setMD5(e_LANGUAGE.USERCLASS_LIST)->set('forum_perms', $tmp); diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 0e1b430cf..9bf439325 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -666,6 +666,14 @@ class forum_post_handler } + private function renderBreadcrumb() + { + $sc = e107::getScBatch('post', 'forum')->setScVar('forum', $this->forumObj)->setScVar('threadInfo', vartrue($this->data))->setVars($this->data); + return e107::getParser()->parseTemplate("
{FORUM_POST_BREADCRUMB}
",true,$sc); + + } + + private function renderFormSplit() { if(!deftrue('MODERATOR')) @@ -679,9 +687,8 @@ class forum_post_handler $tp = e107::getParser(); $ns = e107::getRender(); - $sc = e107::getScBatch('post', 'forum')->setScVar('forum', $this->forumObj)->setScVar('threadInfo', vartrue($this->data))->setVars($this->data); - $text = $tp->parseTemplate("
{FORUM_POST_BREADCRUMB}
",true,$sc); + $text = $this->renderBreadcrumb(); $text .= e107::getMessage()->setTitle("Warning!",E_MESSAGE_ERROR)->addError("This post, and every post below it will be moved into a new thread/topic.")->render(); @@ -792,11 +799,12 @@ class forum_post_handler $tp = e107::getParser(); $ns = e107::getRender(); + $text = $this->renderBreadcrumb(); - $text = " + $text .= "
- +
".LAN_FORUM_3011.": @@ -882,7 +890,9 @@ class forum_post_handler if(deftrue('BOOTSTRAP')) //v2.x { - $text = $frm->open('forum-report-thread','post'); + $text = $this->renderBreadcrumb(); + + $text .= $frm->open('forum-report-thread','post'); $text .= "
@@ -895,7 +905,7 @@ class forum_post_handler
- ".$frm->textarea('report_add','',10,35,array('size'=>'xxlarge'))." + ".$frm->textarea('report_add','',10,35,array('size'=>'xxlarge', 'placeholder'=>LAN_FORUM_2038))."