@@ -95,18 +95,15 @@ |
||
| 95 | 95 | && array_key_exists('id', $user->{$fieldMethod}()) |
| 96 | 96 | ) { |
| 97 | 97 | $data[$column->getName()] = $user->{$fieldMethod}()['name']; |
| 98 | - } |
|
| 99 | - elseif (method_exists($user, $fieldMethod) |
|
| 98 | + } elseif (method_exists($user, $fieldMethod) |
|
| 100 | 99 | && is_object($user->{$fieldMethod}()) && method_exists($user->{$fieldMethod}(), 'getName') |
| 101 | 100 | ) { |
| 102 | 101 | $object = $user->{$fieldMethod}(); |
| 103 | 102 | $data[$column->getName()] = $object->getName(); |
| 104 | - } |
|
| 105 | - elseif($column->getName() === 'Currency') { |
|
| 103 | + } elseif($column->getName() === 'Currency') { |
|
| 106 | 104 | //Todo: Do a pull request about \ZCRMUser::geCurrency() to \ZCRMUser::getCurrency() |
| 107 | 105 | $data[$column->getName()] = $user->geCurrency(); |
| 108 | - } |
|
| 109 | - else { |
|
| 106 | + } else { |
|
| 110 | 107 | continue; |
| 111 | 108 | } |
| 112 | 109 | } |