Merge pull request #5011 from eileenmcnaughton/rebase2

[civicrm-core.git] / settings / Member.setting.php

diff --git a/settings/Member.setting.php b/settings/Member.setting.php
index 9b9e44776789d2f14b829ad0f698f448256200bf..a4039a451a91e8badf30aba05b1987bbde68ace3 100644 (file)
--- a/settings/Member.setting.php
+++ b/settings/Member.setting.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -43,7 +43,7 @@ return array(
     'name' => 'default_renewal_contribution_page',
     'type' => 'Integer',
     'html_type' => 'Select',
-    'default' => null,
+    'default' => NULL,
     'pseudoconstant' => array(
       'name' => 'contributionPage',
     ),
@@ -52,6 +52,6 @@ return array(
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => 'If you select a default online contribution page for self-service membership renewals, a "renew" link pointing to that page will be displayed on the Contact Dashboard for memberships which were entered offline. You will need to ensure that the membership block for the selected online contribution page includes any currently available memberships.',
-    'help_text' => null,
+    'help_text' => NULL,
   ),
 );