Merge branch '4.5' into master

[civicrm-core.git] / CRM / Upgrade / Incremental / php / ThreeTwo.php

diff --git a/CRM/Upgrade/Incremental/php/ThreeTwo.php b/CRM/Upgrade/Incremental/php/ThreeTwo.php
index 1225de8743aee0986fb9c108f219aa792d980ae6..2b816aa2b36f185f27b15be1b26b4c729ccb6d19 100644 (file)
--- a/CRM/Upgrade/Incremental/php/ThreeTwo.php
+++ b/CRM/Upgrade/Incremental/php/ThreeTwo.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -37,20 +37,24 @@ class CRM_Upgrade_Incremental_php_ThreeTwo {
    *
    * @return bool
    */
-  function verifyPreDBstate(&$errors) {
+  public function verifyPreDBstate(&$errors) {
     return TRUE;
   }
 
   /**
    * @param $rev
    */
-  function upgrade_3_2_alpha1($rev) {
+  public function upgrade_3_2_alpha1($rev) {
     //CRM-5666 -if user already have 'access CiviCase'
     //give all new permissions and drop access CiviCase.
     $config = CRM_Core_Config::singleton();
     if ($config->userSystem->is_drupal) {
 
-      $config->userSystem->replacePermission('access CiviCase', array('access my cases and activities', 'access all cases and activities', 'administer CiviCase'));
+      $config->userSystem->replacePermission('access CiviCase', array(
+          'access my cases and activities',
+          'access all cases and activities',
+          'administer CiviCase'
+        ));
 
       //insert core acls.
       $casePermissions = array(
@@ -90,7 +94,7 @@ class CRM_Upgrade_Incremental_php_ThreeTwo {
   /**
    * @param $rev
    */
-  function upgrade_3_2_beta4($rev) {
+  public function upgrade_3_2_beta4($rev) {
     $upgrade = new CRM_Upgrade_Form;
 
     $config = CRM_Core_Config::singleton();
@@ -108,7 +112,10 @@ class CRM_Upgrade_Incremental_php_ThreeTwo {
       $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales);
       // optimal: an English locale
       foreach (array(
-        'en_US', 'en_GB', 'en_AU') as $loc) {
+                 'en_US',
+                 'en_GB',
+                 'en_AU'
+               ) as $loc) {
         if (in_array($loc, $locales)) {
           $seedLocale = $loc;
           break;
@@ -264,7 +271,7 @@ UPDATE  civicrm_membership_status
   /**
    * @param $rev
    */
-  function upgrade_3_2_1($rev) {
+  public function upgrade_3_2_1($rev) {
     //CRM-6565 check if Activity Index is already exists or not.
     $addActivityTypeIndex = TRUE;
     $indexes = CRM_Core_DAO::executeQuery('SHOW INDEXES FROM civicrm_activity');
@@ -282,4 +289,3 @@ UPDATE  civicrm_membership_status
     $upgrade->processSQL($rev);
   }
 }
-