From: Mattias Michaux <mattias.michaux@gmail.com>
Date: Thu, 13 Oct 2016 14:59:02 +0000 (+0200)
Subject: Don't store empty array value of a setting as NULL.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=56038eaea92f81afd4fa0ca29a92ae144f03a27e;p=civicrm-core.git

Don't store empty array value of a setting as NULL.
---

diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php
index e948b5dfc1..4f46fd7ac7 100644
--- a/CRM/Core/BAO/Setting.php
+++ b/CRM/Core/BAO/Setting.php
@@ -430,8 +430,7 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
         );
       }
     }
-
-    if (CRM_Utils_System::isNull($value)) {
+    if (!is_array($value) && CRM_Utils_System::isNull($value)) {
       $dao->value = 'null';
     }
     else {