Merge remote-tracking branch 'origin/master' into akun

@@ -301,14 +301,16 @@ class ProductController extends BaseController
                 if($v['type'] == 3){
                     $arr = json_decode($info['values']);
                     foreach ($arr as $k1=>$v1){
-                        $v1 = getImageUrl($v1);
+                        $v1 = (array)$v1;
+                        $v1['url'] = getImageUrl($v1['url']);
                         $arr[$k1] = $v1;
                     }
                     $v['values'] = $arr;
                 }elseif($v['type'] == 4){
                     $arr1 = json_decode($info['values']);
                     foreach ($arr1 as $k1=>$v1){
-                        $v1 = getImageUrl($v1);
+                        $v1 = (array)$v1;
+                        $v1 = getFileUrl($v1);
                         $arr1[$k1] = $v1;
                     }
                     $v['values'] = $arr1;

@@ -111,12 +111,18 @@ class ProductLogic extends  BaseLogic
                 continue;
             }
             unset($v['title']);
-            if($v['type'] == 3 || $v['type'] == 4){
+            if($v['type'] == 3){
                 foreach ($v['values'] as $k1=>$v1){
                     $v1['url'] = str_replace_url($v1['url']);
                     $v['values'][$k1] = $v1;
                 }
                 $v['values'] = json_encode($v['values']);
+            }elseif ($v['type'] == 4){
+                foreach ($v['values'] as $k1=>$v1){
+                    $v1 = str_replace_url($v1);
+                    $v['values'][$k1] = $v1;
+                }
+                $v['values'] = json_encode($v['values']);
             }
             $v['project_id'] = $this->user['project_id'];
             $v['product_id'] = $product_id;