From c435f68d502432b78a595eab9f990a5f6a81e645 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Mon, 2 Jan 2017 15:08:33 +0000 Subject: [PATCH 1/3] Incorrect Apostrophe - Fixes #2238 Incorrect Apostrophe - Fixes #2238 --- e107_plugins/faqs/faqs.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php index b0266ff65..479de1f7b 100644 --- a/e107_plugins/faqs/faqs.php +++ b/e107_plugins/faqs/faqs.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2017 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -614,10 +614,10 @@ class faq { global $faqpref,$timing_start,$tp,$cust_footer, $CUSTOMPAGES, $CUSTOMHEADER, $CUSTOMHEADER; $text_menu .= "

-   [ ".LAN_FAQS_BACK_TO_CATEGORIES." ]  "; +   [ ".LAN_FAQS_BACK_TO_CATEGORIES." ]  "; if(check_class($faqpref['add_faq'])){ - $text_menu .="[ ".LAN_FAQS_ASK_A_QUESTION." ]"; + $text_menu .="[ ".LAN_FAQS_ASK_A_QUESTION." ]"; } $text_menu .="
"; From caeba315fdfce10d8eaa34692765775124d53665 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Mon, 2 Jan 2017 15:36:25 +0000 Subject: [PATCH 2/3] Notice Removal - FAQ Notice Removal - FAQ --- e107_plugins/faqs/faqs.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php index 479de1f7b..4d7b50006 100644 --- a/e107_plugins/faqs/faqs.php +++ b/e107_plugins/faqs/faqs.php @@ -122,7 +122,7 @@ if (isset($_POST['commentsubmit'])) $faqpref = e107::getPlugConfig('faqs')->getPref(); - if ($action == "" || $action == "main") + if (varset($action) == "" || $action == "main") { if(vartrue($faqpref['classic_look'])) { @@ -133,7 +133,7 @@ if (isset($_POST['commentsubmit'])) { $srch = vartrue($_GET['srch']); $ftmp = $faq->view_all($srch); - $caption = FAQLAN_FAQ; + $caption = LAN_FAQS_FAQ; } @@ -178,7 +178,7 @@ if (isset($_POST['commentsubmit'])) if($action == "cat" && $idx) { $ftmp = $faq->view_faq($idx) ; - define("e_PAGETITLE",FAQLAN_FAQ." - ". $ftmp['title']); + define("e_PAGETITLE",LAN_FAQS_FAQ." - ". $ftmp['title']); require_once(HEADERF); $ns -> tablerender($ftmp['caption'], $ftmp['text']); } @@ -284,7 +284,7 @@ class faq $text .= $tp->parseTemplate($template['end'], true, $this->sc); // footer - $ret['title'] = FAQLAN_FAQ; + $ret['title'] = LAN_FAQS_FAQ; $ret['text'] = $text; if (!empty($this->pref['page_title'][e_LANGUAGE])) @@ -379,8 +379,8 @@ class faq $prevcat = ""; $sc = e107::getScBatch('faqs', true); $sc->counter = 1; - $sc->tag = htmlspecialchars($tag, ENT_QUOTES, 'utf-8'); - $sc->category = $category; + $sc->tag = htmlspecialchars(varset($tag), ENT_QUOTES, 'utf-8'); + $sc->category = varset($category); if(!empty($_GET['id'])) // expand one specific FAQ. { @@ -475,7 +475,7 @@ class faq $text .= $tp->parseTemplate($FAQ_LIST_END, true); - $ret['title'] = FAQLAN_FAQ." - ".$category_title; + $ret['title'] = LAN_FAQS_FAQ." - ".$category_title; $ret['text'] = $text.$this->faq_footer($id); $ret['caption'] = $caption; return $ret; From ed8183cc7cdcbe4638e1b74367c3694d21b70d66 Mon Sep 17 00:00:00 2001 From: MikeyGMT Date: Wed, 4 Jan 2017 08:32:40 +0000 Subject: [PATCH 3/3] FAQ - further correction FAQ - further correction --- e107_plugins/faqs/faqs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php index 4d7b50006..24d888d44 100644 --- a/e107_plugins/faqs/faqs.php +++ b/e107_plugins/faqs/faqs.php @@ -122,7 +122,7 @@ if (isset($_POST['commentsubmit'])) $faqpref = e107::getPlugConfig('faqs')->getPref(); - if (varset($action) == "" || $action == "main") + if (empty($action) || $action == "main") { if(vartrue($faqpref['classic_look'])) {