notice fixes

diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php
index b9d771fa2ad181c2b8c0a1e192ca93ec1ee9de2a..d7c810ef9d5f8a431ab2925a822d3ce806c02721 100755 (executable)
--- a/CRM/Campaign/BAO/Query.php
+++ b/CRM/Campaign/BAO/Query.php
@@ -414,7 +414,7 @@ INNER JOIN  civicrm_custom_group grp on fld.custom_group_id = grp.id
    * @return $voterClause as a string
    * @static
    */
-  function voterClause($params) {
+  static public function voterClause($params) {
     $voterClause = array();
     $fromClause = $whereClause = NULL;
     if (!is_array($params) || empty($params)) {

diff --git a/CRM/Campaign/Form/Survey/Results.php b/CRM/Campaign/Form/Survey/Results.php
index 7c2ceba0f50c45f5c7a6371c882f5d0c57ebeabe..304b545c2d2d947f94cd579dcc272c95f6934ebd 100644 (file)
--- a/CRM/Campaign/Form/Survey/Results.php
+++ b/CRM/Campaign/Form/Survey/Results.php
@@ -399,7 +399,7 @@ class CRM_Campaign_Form_Survey_Results extends CRM_Campaign_Form_Survey {
     $survey = CRM_Campaign_BAO_Survey::create($params);
 
     // create report if required.
-    if ( !$this->_reportId && $survey->id && $params['create_report'] ) {
+    if ( !$this->_reportId && $survey->id && CRM_Utils_Array::value('create_report', $params) ) {
       $activityStatus = CRM_Core_PseudoConstant::activityStatus('name');
       $activityStatus = array_flip($activityStatus);
       $this->_params =