@@ -110,8 +110,12 @@ |
||
110 | 110 | // Normalise "empty" values into dashes so comparisons are done properly. |
111 | 111 | // This means there is no diference between an empty string and a null |
112 | 112 | // but "0" is considered to be non-empty. |
113 | - if(empty($from) && !strlen($from)) $from = '-'; |
|
114 | - if(empty($to) && !strlen($to)) $to = '-'; |
|
113 | + if(empty($from) && !strlen($from)) { |
|
114 | + $from = '-'; |
|
115 | + } |
|
116 | + if(empty($to) && !strlen($to)) { |
|
117 | + $to = '-'; |
|
118 | + } |
|
115 | 119 | |
116 | 120 | return $this->changes[$title] = array( |
117 | 121 | 'from' => $from, |
@@ -205,12 +205,16 @@ |
||
205 | 205 | */ |
206 | 206 | public function getFullDeployMessages() { |
207 | 207 | $strategy = $this->getDeploymentStrategy(); |
208 | - if ($strategy->getActionCode()!=='full') return null; |
|
208 | + if ($strategy->getActionCode()!=='full') { |
|
209 | + return null; |
|
210 | + } |
|
209 | 211 | |
210 | 212 | $changes = $strategy->getChangesModificationNeeded(); |
211 | 213 | $messages = []; |
212 | 214 | foreach ($changes as $change => $details) { |
213 | - if ($change==='Code version') continue; |
|
215 | + if ($change==='Code version') { |
|
216 | + continue; |
|
217 | + } |
|
214 | 218 | |
215 | 219 | $messages[] = [ |
216 | 220 | 'Flag' => sprintf( |
@@ -58,7 +58,9 @@ |
||
58 | 58 | |
59 | 59 | protected function addHandlers($machine) { |
60 | 60 | $class = get_class($machine->getObject()); |
61 | - if (empty($this->config()->handlers[$class])) return; |
|
61 | + if (empty($this->config()->handlers[$class])) { |
|
62 | + return; |
|
63 | + } |
|
62 | 64 | |
63 | 65 | $transitions = $this->config()->handlers[$class]; |
64 | 66 | foreach ($transitions as $transName => $handlers) { |
@@ -13,7 +13,7 @@ |
||
13 | 13 | $timestamp = new DateTime($this->value, new DateTimeZone(date_default_timezone_get())); |
14 | 14 | //if a user is logged in, has set a timezone that is in the allowed list and |
15 | 15 | //that timezone is NOT the default one then convert the timestamp to use the selected timezone |
16 | - if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()){ |
|
16 | + if(Member::currentUserID() && isset(Member::CurrentUser()->Timezone) && in_array(Member::CurrentUser()->Timezone, timezone_identifiers_list()) && Member::CurrentUser()->Timezone != date_default_timezone_get()) { |
|
17 | 17 | $timestamp->setTimezone(new DateTimeZone(Member::CurrentUser()->Timezone)); |
18 | 18 | } |
19 | 19 | //return timestamp in "Nice" format + the user's timezone |
@@ -14,7 +14,7 @@ |
||
14 | 14 | return array_combine($timezones, $timezones); |
15 | 15 | } |
16 | 16 | |
17 | - public function updateCMSFields(FieldList $fields) { |
|
17 | + public function updateCMSFields(FieldList $fields) { |
|
18 | 18 | $fields->removeFieldFromTab('Root', 'Timezone'); |
19 | 19 | $field = DropdownField::create( |
20 | 20 | 'Timezone', |