Fix media type setting's logical problem

AsgardCms · Apr 19, 2018 · c16858e · c16858e
1 parent 1eacf7a
commit c16858e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Modules/Setting/Entities/Setting.php b/Modules/Setting/Entities/Setting.php
@@ -14,9 +14,9 @@ class Setting extends Model
     protected $fillable = ['name', 'value', 'description', 'isTranslatable', 'plainValue'];
     protected $table = 'setting__settings';
 
-    public function hasMedia(): bool
+    public function isMedia(): bool
     {
         $value = json_decode($this->plainValue, true);
-        return is_array($value) && isset($value['media_single']) && $setting->files->count();
+        return is_array($value) && isset($value['media_single']);
     }
 }
diff --git a/Modules/Setting/Support/Settings.php b/Modules/Setting/Support/Settings.php
@@ -36,7 +36,7 @@ public function get($name, $locale = null, $default = null)
             return is_null($default) ? $defaultFromConfig : $default;
         }
 
-        if($setting->hasMedia() && $media = $setting->files->first()) {
+        if($setting->isMedia() && $media = $setting->files()->first()) {
             return $media->path;
         }