From ce8ff6efe5bdf3194343593e37fd8542f9bf1c50 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 19 Sep 2017 08:04:23 -0400
Subject: [PATCH] Custom field descriptions can be saved

---
 admin/custom_fields.php                  | 6 ++++--
 install/mods-for-hesk/sql/installSql.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin/custom_fields.php b/admin/custom_fields.php
index 934cceda..49f7044f 100755
--- a/admin/custom_fields.php
+++ b/admin/custom_fields.php
@@ -918,6 +918,7 @@ function save_cf()
 	`req`      = '{$cf['req']}',
 	`category` = ".(count($cf['categories']) ? "'".json_encode($cf['categories'])."'" : 'NULL').",
 	`name`     = '".hesk_dbEscape($cf['names'])."',
+	`mfh_description` = '".hesk_dbEscape($cf['descriptions'])."',
 	`value`    = ".(strlen($cf['value']) ? "'".hesk_dbEscape($cf['value'])."'" : 'NULL')."
 	WHERE `id`={$id}");
 
@@ -1094,7 +1095,7 @@ function cf_validate()
 	}
 
 	// Descriptions
-    $cf['descriptions'] = hesk_POST_array('descriptions');
+    $cf['descriptions'] = hesk_POST_array('description');
 
 	// Make sure only non-empty descriptions pass
     foreach ($cf['descriptions'] as $key => $description) {
@@ -1324,6 +1325,7 @@ function cf_validate()
 	$cf['descriptions'] = addslashes(json_encode($cf['descriptions']));
 	$cf['value'] = $cf['type'] == 'date' ? json_encode($cf['value']) : addslashes(json_encode($cf['value']));
 
+
 	return $cf;
 } // END cf_validate()
 
@@ -1363,7 +1365,7 @@ function new_cf()
 	`req`      = '{$cf['req']}',
 	`category` = ".(count($cf['categories']) ? "'".json_encode($cf['categories'])."'" : 'NULL').",
 	`name`     = '".hesk_dbEscape($cf['names'])."',
-	`mfh_description` = '".hesk_dbEscape($cf['mfh_description'])."',
+	`mfh_description` = '".hesk_dbEscape($cf['descriptions'])."',
     `value`    = ".(strlen($cf['value']) ? "'".hesk_dbEscape($cf['value'])."'" : 'NULL').",
 	`order`    = 990
 	WHERE `id`={$_SESSION['cford']}");
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 22a2c000..18cb6dc4 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -1136,7 +1136,7 @@ function execute320Scripts() {
     global $hesk_settings;
     hesk_dbConnect();
 
-    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` 
+    executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories`
         ADD COLUMN `mfh_description` VARCHAR(255)");
     executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_fields`
         ADD COLUMN `mfh_description` VARCHAR(255)");