From db391d326573376f400bcd89ff3e7cc06895bf19 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 2 Oct 2016 12:07:05 +0200
Subject: [PATCH] Core adjustments for pending issues

---
 Models/Collection.php       | 1 -
 Models/CollectionMapper.php | 4 ++--
 Models/UploadFile.php       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Models/Collection.php b/Models/Collection.php
index 8652621..aa2a546 100644
--- a/Models/Collection.php
+++ b/Models/Collection.php
@@ -15,7 +15,6 @@
  */
 namespace Modules\Media\Models;
 
-
 /**
  * Media class.
  *
diff --git a/Models/CollectionMapper.php b/Models/CollectionMapper.php
index 61f0d0c..4a273c3 100644
--- a/Models/CollectionMapper.php
+++ b/Models/CollectionMapper.php
@@ -15,6 +15,7 @@
  */
 namespace Modules\Media\Models;
 
+use Modules\Media\Models\MediaMapper;
 use phpOMS\DataStorage\Database\Query\Builder;
 use phpOMS\DataStorage\Database\Query\Column;
 
@@ -22,8 +23,7 @@ class CollectionMapper extends MediaMapper
 {
     protected static $hasMany = [
         'sources' => [
-            'mapper'         => \Modules\Media\Models\MediaMapper::class, /* mapper of the related object */
-            'relationmapper' => null, /* if the relation itself is a more complex object that has it's own mapper */
+            'mapper'         => MediaMapper::class, /* mapper of the related object */
             'table'          => 'media_relation', /* table of the related object, null if no relation table is used (many->1) */
             'dst'            => 'media_relation_dst',
             'src'            => 'media_relation_src',
diff --git a/Models/UploadFile.php b/Models/UploadFile.php
index 27b79fb..270e7d6 100644
--- a/Models/UploadFile.php
+++ b/Models/UploadFile.php
@@ -15,7 +15,7 @@
  */
 namespace Modules\Media\Models;
 
-use phpOMS\System\File\Directory;
+use phpOMS\System\File\Local\Directory;
 
 
 /**