From 4e66d748578629a8ae292529de60c7397a481646 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 6 Jan 2015 14:56:58 -0800 Subject: [PATCH] INFRA-132 - CRM/Upgrade - Misc --- CRM/Upgrade/Controller.php | 3 ++- CRM/Upgrade/Form.php | 3 ++- CRM/Upgrade/Incremental/php/ThreeThree.php | 3 ++- CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php | 6 ++++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CRM/Upgrade/Controller.php b/CRM/Upgrade/Controller.php index 145e12e867..ce68ebc94d 100644 --- a/CRM/Upgrade/Controller.php +++ b/CRM/Upgrade/Controller.php @@ -37,7 +37,8 @@ class CRM_Upgrade_Controller extends CRM_Core_Controller { /** * Class constructor */ - function __construct($title = NULL, + function __construct( + $title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE ) { diff --git a/CRM/Upgrade/Form.php b/CRM/Upgrade/Form.php index 406fc40e98..bc5faa7d22 100644 --- a/CRM/Upgrade/Form.php +++ b/CRM/Upgrade/Form.php @@ -99,7 +99,8 @@ class CRM_Upgrade_Form extends CRM_Core_Form { * @param string $method * @param null|string $name */ - function __construct($state = NULL, + function __construct( + $state = NULL, $action = CRM_Core_Action::NONE, $method = 'post', $name = NULL diff --git a/CRM/Upgrade/Incremental/php/ThreeThree.php b/CRM/Upgrade/Incremental/php/ThreeThree.php index 654bda1c13..3556707547 100644 --- a/CRM/Upgrade/Incremental/php/ThreeThree.php +++ b/CRM/Upgrade/Incremental/php/ThreeThree.php @@ -266,7 +266,8 @@ WHERE id = %2 $mainLineItem->find(TRUE); while ($mainLineItem->fetch()) { $dupeLineItem = new CRM_Price_BAO_LineItem(); - foreach ($fields as $fld) { $dupeLineItem->$fld = $mainLineItem->$fld; + foreach ($fields as $fld) { + $dupeLineItem->$fld = $mainLineItem->$fld; } $dupeLineItem->find(TRUE); $dupeLineItem->addWhere("id != $mainLineItem->id"); diff --git a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php index bb1e2f8fde..30a5023992 100644 --- a/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php +++ b/CRM/Upgrade/Snapshot/V4p2/Price/BAO/Field.php @@ -143,7 +143,8 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p if ($opId = CRM_Utils_Array::value($index, $opIds)) { $optionsIds['id'] = $opId; } - else { $optionsIds['id'] = NULL; + else { + $optionsIds['id'] = NULL; } } CRM_Upgrade_Snapshot_V4p2_Price_BAO_FieldValue::create($options, $optionsIds); @@ -219,7 +220,8 @@ class CRM_Upgrade_Snapshot_V4p2_Price_BAO_Field extends CRM_Upgrade_Snapshot_V4p * @return null * @static */ - public static function addQuickFormElement(&$qf, + public static function addQuickFormElement( + &$qf, $elementName, $fieldId, $inactiveNeeded, -- 2.25.1