From 7537f23bc3462bd633098070fd197bd444919ce0 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 24 Nov 2015 16:51:24 -0500 Subject: [PATCH 1/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37f3f099..f26759aa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ If you have already completed any of these steps in the past (such as creating a - Check for unnecessary whitespace using the `git diff --check` command. If there is trailing whitespace, your pull request will be denied. ## Submitting Changes - - Sign the [Contributor License Agreement](https://www.clahub.com/agreements/mkoch227/Mods-for-HESK) + - Sign the [Contributor License Agreement](https://gist.github.com/mkoch227/edf8243d8c75d104247a) - Push your changes to a topic branch in your fork of the repository - Submit a pull request to the official Mods for HESK repository (mkoch227/Mods-for-HESK) - The owner of Mods for HESK will then inspect and test the code in the pull request. Feedback will be given via GitHub comments. From 7c13c5d7b9ed5a2e42c1f27afff65295f10257d5 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 24 Nov 2015 16:53:07 -0500 Subject: [PATCH 2/3] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f26759aa..e174429b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,8 +21,8 @@ If you have already completed any of these steps in the past (such as creating a - Check for unnecessary whitespace using the `git diff --check` command. If there is trailing whitespace, your pull request will be denied. ## Submitting Changes - - Sign the [Contributor License Agreement](https://gist.github.com/mkoch227/edf8243d8c75d104247a) - Push your changes to a topic branch in your fork of the repository - Submit a pull request to the official Mods for HESK repository (mkoch227/Mods-for-HESK) + - If necessary, sign the Contributor License Agreement by checking the "status checks" area of your pull request. - The owner of Mods for HESK will then inspect and test the code in the pull request. Feedback will be given via GitHub comments. - The owner of Mods for HESK expects responses within two weeks of the original comment. If there is no feedback within that time range, the pull request will be considered abandoned and subsequently will be closed. From f739780f9e0f3c053f5b9a0323c9362ec34aae00 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sat, 9 Jan 2016 20:55:17 -0500 Subject: [PATCH 3/3] Fixes #457 Move around some database stuff to fix the knowledgebase error --- knowledgebase.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/knowledgebase.php b/knowledgebase.php index daedd989..a2741297 100644 --- a/knowledgebase.php +++ b/knowledgebase.php @@ -36,12 +36,16 @@ require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/knowledgebase_functions.inc.php'); -// Are we in maintenance mode? -hesk_check_maintenance(); // Load Knowledgebase-related functions hesk_load_database_functions(); +/* Connect to database */ +hesk_dbConnect(); + +// Are we in maintenance mode? +hesk_check_maintenance(); + define('PAGE_TITLE', 'CUSTOMER_KB'); /* Is Knowledgebase enabled? */ @@ -49,9 +53,6 @@ if (!$hesk_settings['kb_enable']) { hesk_error($hesklang['kbdis']); } -/* Connect to database */ -hesk_dbConnect(); - /* Rating? */ if (isset($_GET['rating'])) { // Detect and block robots