Merge pull request #13501 from civicrm/5.10

5.10
civicrm · Jan 27, 2019 · 8cb0d7d · 8cb0d7d
2 parents a2aecef + bb50227
commit 8cb0d7d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/CRM/Core/DAO.php b/CRM/Core/DAO.php
@@ -1665,9 +1665,7 @@ public static function &copyGeneric($daoName, $criteria, $newData = NULL, $field
         }
 
         if ($newData) {
-          foreach ($newData as $k => $v) {
-            $newObject->$k = $v;
-          }
+          $newObject->copyValues($newData);
         }
       }
       $newObject->save();

diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
@@ -924,7 +924,7 @@ public static function &getCompleteInfo(
    * @return CRM_Event_DAO_Event
    * @throws \CRM_Core_Exception
    */
-  public static function copy($id) {
+  public static function copy($id, $params = []) {
     $eventValues = array();
 
     //get the require event values.
@@ -947,7 +947,7 @@ public static function copy($id) {
     $copyEvent = CRM_Core_DAO::copyGeneric('CRM_Event_DAO_Event',
       array('id' => $id),
       // since the location is sharable, lets use the same loc_block_id.
-      array('loc_block_id' => CRM_Utils_Array::value('loc_block_id', $eventValues)),
+      array('loc_block_id' => CRM_Utils_Array::value('loc_block_id', $eventValues)) + $params,
       $fieldsFix
     );
     CRM_Price_BAO_PriceSet::copyPriceSet('civicrm_event', $id, $copyEvent->id);

diff --git a/CRM/Event/Form/ManageEvent/EventInfo.php b/CRM/Event/Form/ManageEvent/EventInfo.php
@@ -255,7 +255,7 @@ public function postProcess() {
 
     // now that we have the event’s id, do some more template-based stuff
     if (!empty($params['template_id'])) {
-      $event = CRM_Event_BAO_Event::copy($params['template_id']);
+      $event = CRM_Event_BAO_Event::copy($params['template_id'], $params);
     }
     else {
       $event = CRM_Event_BAO_Event::create($params);