Merge pull request #9326 from eileenmcnaughton/cont_page_null

CRM-19478 Handle contribution_page_id = 'null' oddity.
civicrm · Oct 27, 2016 · 3613af4 · 3613af4
2 parents bc0afc0 + 8536e5a
commit 3613af4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
@@ -2148,7 +2148,8 @@ protected static function repeatTransaction(&$contribution, &$input, $contributi
       //CRM-18805 -- Contribution page not recorded on recurring transactions, Recurring contribution payments
       //do not create CC or BCC emails or profile notifications.
       //The if is just to be safe. Not sure if we can ever arrive with this unset
-      if (isset($contribution->contribution_page_id)) {
+      // but per CRM-19478 it seems it can be 'null'
+      if (isset($contribution->contribution_page_id) && is_numeric($contribution->contribution_page_id)) {
         $contributionParams['contribution_page_id'] = $contribution->contribution_page_id;
       }