Merge branch 'master' into v1.3

2018-02-09 08:28:42 +00:00 · 2018-02-09 08:28:42 +00:00 · a6484b801c
commit a6484b801c
parent 095c4f5181 d07fb5ea99
1 changed files with 1 additions and 0 deletions
--- a/app/Item.php
+++ b/app/Item.php
@ -56,6 +56,7 @@ class Item extends Model
    public function getConfigAttribute()
    {
        $output = null;
+        $view = null;
        if(isset($this->description) && !empty($this->description)){
            $output = json_decode($this->description);
            if(isset($output->type) && !empty($output->type)) {