From 43427a24c738b01513d002196441bf990c67c9fa Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurund@civicrm.org>
Date: Wed, 15 May 2013 12:56:23 -0400
Subject: [PATCH] notice fixes
---
CRM/Campaign/BAO/Petition.php | 4 ++--
CRM/Campaign/Form/Petition.php | 7 +++++++
CRM/Campaign/Form/Petition/Signature.php | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/CRM/Campaign/BAO/Petition.php b/CRM/Campaign/BAO/Petition.php
index b635d8d8dd..08bc93bc43 100644
--- a/CRM/Campaign/BAO/Petition.php
+++ b/CRM/Campaign/BAO/Petition.php
@@ -32,7 +32,7 @@
* $Id$
*
*/
-Class CRM_Campaign_BAO_Petition extends CRM_Campaign_BAO_Survey {
+class CRM_Campaign_BAO_Petition extends CRM_Campaign_BAO_Survey {
function __construct() {
parent::__construct();
// expire cookie in one day
@@ -328,7 +328,7 @@ AND tag_id = ( SELECT id FROM civicrm_tag WHERE name = %2 )";
}
- public function getSurveyInfo($surveyId = NULL) {
+ public static function getSurveyInfo($surveyId = NULL) {
$surveyInfo = array();
$sql = "
diff --git a/CRM/Campaign/Form/Petition.php b/CRM/Campaign/Form/Petition.php
index 2cca8a3d11..7cfd51df2f 100644
--- a/CRM/Campaign/Form/Petition.php
+++ b/CRM/Campaign/Form/Petition.php
@@ -37,8 +37,15 @@
* This class generates form components for adding a petition
*
*/
+
class CRM_Campaign_Form_Petition extends CRM_Core_Form {
+ /**
+ * @var int
+ * @protected
+ */
+ protected $_surveyId;
+
public function preProcess() {
if (!CRM_Campaign_BAO_Campaign::accessCampaign()) {
CRM_Utils_System::permissionDenied();
diff --git a/CRM/Campaign/Form/Petition/Signature.php b/CRM/Campaign/Form/Petition/Signature.php
index 9ba7322177..18feedb535 100644
--- a/CRM/Campaign/Form/Petition/Signature.php
+++ b/CRM/Campaign/Form/Petition/Signature.php
@@ -523,7 +523,7 @@ class CRM_Campaign_Form_Petition_Signature extends CRM_Core_Form {
// create the signature activity record
$params['contactId'] = $this->_contactId;
- $params['activity_campaign_id'] = $this->petition['campaign_id'];
+ $params['activity_campaign_id'] = CRM_Utils_Array::value('campaign_id', $this->petition);
$result = $this->bao->createSignature($params);
// send thank you or email verification emails
--
GitLab