Merge pull request #2 from civicrm/master

[civicrm-core.git] / CRM / Campaign / BAO / Survey.php

diff --git a/CRM/Campaign/BAO/Survey.php b/CRM/Campaign/BAO/Survey.php
index 7ec3ca0e4ad22e58c70a8f9bdd9c74fcb57b550e..4333c01118885a23c9a74c22f11905491fac48db 100644 (file)
--- a/CRM/Campaign/BAO/Survey.php
+++ b/CRM/Campaign/BAO/Survey.php
@@ -314,7 +314,7 @@ SELECT  survey.id    as id,
    * @param string $returnColumn
    * @param bool $includePetitionActivityType
    *
-   * @return string
+   * @return mixed
    */
   public static function getSurveyActivityType($returnColumn = 'label', $includePetitionActivityType = FALSE) {
     static $activityTypes;
@@ -439,11 +439,8 @@ SELECT  survey.id    as id,
       $autocompleteContactSearch = CRM_Core_BAO_Setting::valueOptions(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
         'contact_autocomplete_options'
       );
-      $returnProperties = array_fill_keys(array_merge([
-          'contact_type',
-          'contact_sub_type',
-          'sort_name',
-        ],
+      $returnProperties = array_fill_keys(array_merge(
+        ['contact_type', 'contact_sub_type', 'sort_name'],
         array_keys($autocompleteContactSearch)
       ), 1);
     }
@@ -913,7 +910,7 @@ INNER JOIN  civicrm_contact contact_a ON ( activityTarget.contact_id = contact_a
    *
    * @return mixed
    */
-  public Static function getReportID($surveyId) {
+  public static function getReportID($surveyId) {
     static $reportIds = [];
 
     if (!array_key_exists($surveyId, $reportIds)) {