From 0df4fad8397957933aefd73820d169d87f6408dc Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Tue, 23 Jul 2019 17:23:00 -0600
Subject: [PATCH] Fix Default Settings Copy feature.

---
 core/default_settings/default_settings.php | 8 +++++---
 core/domain_settings/domain_settings.php   | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index e8db245760..92be3200f1 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -68,7 +68,7 @@
 		if ($action == 'copy' && permission_exists('domain_setting_add')) {
 			$target_domain_uuid = $_POST["target_domain_uuid"];
 
-			if (is_uuid($target_domain_uuid) && sizeof($default_setting_uuids) > 0) {
+			if (is_uuid($target_domain_uuid) && is_array($default_setting_uuids) && sizeof($default_setting_uuids) > 0) {
 				$settings_copied = 0;
 				foreach ($default_setting_uuids as $default_setting_uuid) {
 
@@ -107,11 +107,13 @@
 					$parameters['domain_setting_name'] = $default_setting_name;
 					$database = new database;
 					$target_domain_setting_uuid = $database->select($sql, $parameters, 'column');
+					$message = $database->message;
+
 					$action = is_uuid($target_domain_setting_uuid) ? 'update' : 'add';
 					unset($sql, $parameters);
 
 					// fix null
-					$default_setting_order = $default_setting_order != '' ? $default_setting_order : 'null';
+					$default_setting_order = $default_setting_order != '' ? $default_setting_order : null;
 
 					//begin array
 					$array['domain_settings'][0]['domain_uuid'] = $target_domain_uuid;
@@ -147,7 +149,7 @@
 				} // foreach
 
 				// set message
-				$_SESSION["message"] = $text['message-copy'].": ".escape($settings_copied);
+				message::add($text['message-copy'].": ".escape($settings_copied));
 			}
 			else {
 				// set message
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 51f9abc98e..5a0db6547f 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -121,7 +121,7 @@
 							unset($sql, $parameters);
 
 							// fix null
-							$domain_setting_order = $domain_setting_order != '' ? $domain_setting_order : 'null';
+							$domain_setting_order = $domain_setting_order != '' ? $domain_setting_order : null;
 
 							//prepare the array
 							$array['domain_settings'][$index]['domain_uuid'] = $target_domain_uuid;
@@ -147,7 +147,7 @@
 						$message = $database->message;
 
 						// set message
-						$_SESSION["message"] = $text['message-copy'].": ".sizeof($array);
+						message::add($text['message-copy'].": ".sizeof($array));
 
 						unset($array);
 					}