@@ -3,11 +3,9 @@ |
||
| 3 | 3 | * for license information see LICENSE.md |
| 4 | 4 | ***************************************************************************/ |
| 5 | 5 | |
| 6 | -use Oc\FieldNotes\Entity\FieldNote; |
|
| 7 | 6 | use Oc\FieldNotes\Enum\LogType as FieldNotesLogType; |
| 8 | 7 | use Oc\FieldNotes\Persistence\FieldNoteEntity; |
| 9 | 8 | use Oc\FieldNotes\Persistence\FieldNoteService; |
| 10 | -use Oc\GeoCache\Entity\GeocacheLog; |
|
| 11 | 9 | use Oc\GeoCache\Enum\GeoCacheType; |
| 12 | 10 | use Oc\GeoCache\Enum\LogType as GeoCacheLogType; |
| 13 | 11 | use Oc\GeoCache\Enum\NeedMaintenance; |
@@ -6,8 +6,6 @@ |
||
| 6 | 6 | |
| 7 | 7 | // used in both lib1 and lib2 code |
| 8 | 8 | |
| 9 | -use OcLegacy\Editor\EditorConstants; |
|
| 10 | - |
|
| 11 | 9 | require_once __DIR__ . '/smiley.inc.php'; |
| 12 | 10 | |
| 13 | 11 | |
@@ -270,7 +270,9 @@ |
||
| 270 | 270 | $entity->comment = (string) $data['comment']; |
| 271 | 271 | $entity->cache = $this->cachesRepository->fetchOneBy(['cache_id' => $entity->cacheid]); |
| 272 | 272 | $entity->user = $this->userRepository->fetchOneById($entity->userid); |
| 273 | - if ($entity->adminid) $entity->admin = $this->userRepository->fetchOneById($entity->adminid); |
|
| 273 | + if ($entity->adminid) { |
|
| 274 | + $entity->admin = $this->userRepository->fetchOneById($entity->adminid); |
|
| 275 | + } |
|
| 274 | 276 | $entity->reportReason = $this->cacheReportReasonsRepository->fetchOneBy(['id' => $entity->reason]); |
| 275 | 277 | $entity->reportStatus = $this->cacheReportStatusRepository->fetchOneBy(['id' => $entity->status]); |
| 276 | 278 | |
@@ -230,7 +230,9 @@ |
||
| 230 | 230 | $entity->longitude = $data['longitude']; |
| 231 | 231 | $entity->latitude = $data['latitude']; |
| 232 | 232 | $entity->restoredBy = (int) $data['restored_by']; |
| 233 | - if ($entity->restoredBy != 0) $entity->user = $this->userRepository->fetchOneById($entity->restoredBy); |
|
| 233 | + if ($entity->restoredBy != 0) { |
|
| 234 | + $entity->user = $this->userRepository->fetchOneById($entity->restoredBy); |
|
| 235 | + } |
|
| 234 | 236 | |
| 235 | 237 | return $entity; |
| 236 | 238 | } |