CRM-19293: Dashboard options disappear after CiviContribute Component Settings save

----------------------------------------
* CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
  https://issues.civicrm.org/jira/browse/CRM-19293

diff --git a/CRM/Admin/Form/Preferences/Contribute.php b/CRM/Admin/Form/Preferences/Contribute.php
index 3d484f7541a02a9b5408237bbdc47d594ba36673..d8a10303884ebe725b00f28d7811ff9c63b95171 100644 (file)
--- a/CRM/Admin/Form/Preferences/Contribute.php
+++ b/CRM/Admin/Form/Preferences/Contribute.php
@@ -248,7 +248,9 @@ class CRM_Admin_Form_Preferences_Contribute extends CRM_Admin_Form_Preferences {
     else {
       $setting = explode(CRM_Core_DAO::VALUE_SEPARATOR, substr($values['user_dashboard_options'], 1, -1));
       $invoiceKey = array_search($setKey, $setting);
-      unset($setting[$invoiceKey]);
+      if (!empty($invoiceKey)) {
+        unset($setting[$invoiceKey]);
+      }
       $settingName = CRM_Core_DAO::VALUE_SEPARATOR .
         implode(CRM_Core_DAO::VALUE_SEPARATOR, array_values($setting)) .
         CRM_Core_DAO::VALUE_SEPARATOR;