Merge branch 'master' of git://github.com/civicrm/civicrm-core into codingstandards-12

[civicrm-core.git] / CRM / Member / Form / Membership.php

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 74eff3ac5f09ba30910aee58a2ff5d7795470a68..4af96fa0febb60d00824f99bfe5e196624b298a4 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -471,7 +471,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
     if ($this->_context == 'standalone') {
       $this->addEntityRef('contact_id', ts('Contact'), array(
           'create' => TRUE,
-          'api' => array('extra' => array('email'))
+          'api' => array('extra' => array('email')),
         ), TRUE);
     }
 
@@ -576,7 +576,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
           }
           $memTypeJs = array(
             'onChange' =>
-              "CRM.buildCustomData( 'Membership', this.value ); buildAutoRenew(this.value, null );",
+            "CRM.buildCustomData( 'Membership', this.value ); buildAutoRenew(this.value, null );",
           );
         }
       }
@@ -761,7 +761,6 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
    * @throws CiviCRM_API3_Exception
    * @return bool|array
    *   mixed true or array of errors
-   * @static
    */
   public static function formRule($params, $files, $self) {
     $errors = array();
@@ -1221,7 +1220,7 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
         if (empty($formValues['source'])) {
           $params['contribution_source'] = ts('%1 Membership: Offline signup (by %2)', array(
               1 => $membershipType,
-              2 => $userName
+              2 => $userName,
             ));
         }
         else {
@@ -1723,9 +1722,8 @@ WHERE   id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )';
    * @param object $membership
    *   Object.
    *
-   * @return boolean
+   * @return bool
    *   true if mail was sent successfully
-   * @static
    */
   public static function emailReceipt(&$form, &$formValues, &$membership) {
     // retrieve 'from email id' for acknowledgement