CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index 66221d929cd08cb9111cfd400bf7f4c2fcff6c8e..3de60d01301f638a1e7c0c5e1877da3f535b03b8 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -297,7 +297,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
       // Add default position for Getting Started Dashlet ( left column)
       $sql = "INSERT INTO `civicrm_dashboard_contact` (dashboard_id, contact_id, column_no, is_active)
 SELECT (SELECT MAX(id) FROM `civicrm_dashboard`), contact_id, 0, IF (SUM(is_active) > 0, 1, 0)
-FROM `civicrm_dashboard_contact` WHERE 1 GROUP BY contact_id";
+FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_contact.contact_id = civicrm_contact.id GROUP BY contact_id";
       CRM_Core_DAO::executeQuery($sql);
     }
     return TRUE;