Merged in atrium-4281 (pull request civicrm#23)

CRM-19092 fix issue where can be '' rather than 0 so cid is not set properly
ErichBSchulz · Aug 12, 2016 · 196729e · 196729e
2 parents 04b7cf1 + 8e6395f
commit 196729e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php
@@ -1584,7 +1584,7 @@ public static function validateMandatoryFields($fields, $values, &$errors) {
    */
   public function getContactID() {
     $tempID = CRM_Utils_Request::retrieve('cid', 'Positive', $this);
-    if (isset($this->_params) && isset($this->_params['select_contact_id'])) {
+    if (isset($this->_params) && !empty($this->_params['select_contact_id'])) {
       $tempID = $this->_params['select_contact_id'];
     }
     if (isset($this->_params, $this->_params[0]) && !empty($this->_params[0]['select_contact_id'])) {
@@ -1599,6 +1599,7 @@ public function getContactID() {
       // from that page
       // we don't really need to set it when $tempID is set because the params have that stored
       $this->set('cid', 0);
+      CRM_Core_Resources::singleton()->addVars('coreForm', array('contact_id' => (int) $tempID));
       return (int) $tempID;
     }