From e6d720bbf88d57a626aeaf0269a2c3ee51025e76 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 20 Nov 2013 10:49:27 +0530
Subject: [PATCH] CRM-13768 - api_v3_CaseTest::testCreateCaseEmpty - Fix
 regression and warning

----------------------------------------
* CRM-13768: CiviCase not fully activated during extension installation
  http://issues.civicrm.org/jira/browse/CRM-13768
---
 CRM/Admin/Form/Setting/Component.php | 2 +-
 CRM/Case/Info.php                    | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CRM/Admin/Form/Setting/Component.php b/CRM/Admin/Form/Setting/Component.php
index 6e10018ef6..b476eb6dfa 100644
--- a/CRM/Admin/Form/Setting/Component.php
+++ b/CRM/Admin/Form/Setting/Component.php
@@ -115,7 +115,7 @@ class CRM_Admin_Form_Setting_Component extends CRM_Admin_Form_Setting {
     CRM_Core_BAO_Navigation::resetNavigation();
   }
 
-  public function loadCaseSampleData($dsn, $fileName, $lineMode = FALSE) {
+  public static function loadCaseSampleData($dsn, $fileName, $lineMode = FALSE) {
     global $crmPath;
 
     $db = &DB::connect($dsn);
diff --git a/CRM/Case/Info.php b/CRM/Case/Info.php
index 14346fabbf..02bb0e043c 100644
--- a/CRM/Case/Info.php
+++ b/CRM/Case/Info.php
@@ -164,8 +164,10 @@ class CRM_Case_Info extends CRM_Core_Component_Info {
    * @param array $metadata Specification of the setting (per *.settings.php)
    */
   public static function onToggleComponents($oldValue, $newValue, $metadata) {
-    if (in_array('CiviCase', $newValue) &&
-      !in_array('CiviCase', $oldValue)
+    if (
+      in_array('CiviCase', $newValue)
+      &&
+      (!$oldValue || !in_array('CiviCase', $oldValue))
     ) {
       $config = CRM_Core_Config::singleton();
       CRM_Admin_Form_Setting_Component::loadCaseSampleData($config->dsn, $config->sqlDir . 'case_sample.mysql');
-- 
2.25.1