X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=Civi%2FCore%2FSettingsBag.php;h=9b415dcf433a5e9af1a2e96b592e2226da3cdd58;hb=4c89e0beffcbdcb9d7a6557e283d386654da92b0;hp=7b621e5e7accdbe7fdc4a0e571bcd9545e3ab2a3;hpb=38f630c0f16067a91635aa9540b0c099d26be4d6;p=civicrm-core.git diff --git a/Civi/Core/SettingsBag.php b/Civi/Core/SettingsBag.php index 7b621e5e7a..9b415dcf43 100644 --- a/Civi/Core/SettingsBag.php +++ b/Civi/Core/SettingsBag.php @@ -3,7 +3,7 @@ +--------------------------------------------------------------------+ | CiviCRM version 4.7 | +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC (c) 2004-2016 | + | Copyright CiviCRM LLC (c) 2004-2017 | +--------------------------------------------------------------------+ | This file is a part of CiviCRM. | | | @@ -364,7 +364,7 @@ class SettingsBag { } } - if (\CRM_Utils_System::isNull($value)) { + if (!is_array($value) && \CRM_Utils_System::isNull($value)) { $dao->value = 'null'; } else {