diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index cc439ab3..161d8a0f 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -151,10 +151,10 @@ class SkinlibController extends Controller
 
         if (!$results->isEmpty()) {
             foreach ($results as $result) {
-                if ($result->type == $t->type) {
-                    return json([
-                        'errno' => 0,
-                        'msg' => trans('skinlib.upload.repeated'),
+                // if the texture already uploaded was setted to private,
+                // then allow to re-upload it.
+                if ($result->type == $t->type && $result->public == "1") {
+                    return json(trans('skinlib.upload.repeated'), 0, [
                         'tid' => $result->tid
                     ]);
                 }
@@ -166,9 +166,7 @@ class SkinlibController extends Controller
         $this->user->setScore($cost, 'minus');
 
         if ($this->user->closet->add($t->tid, $t->name)) {
-            return json([
-                'errno' => 0,
-                'msg'   => trans('skinlib.upload.success', ['name' => $request->input('name')]),
+            return json(trans('skinlib.upload.success', ['name' => $request->input('name')]), 0, [
                 'tid'   => $t->tid
             ]);
         }
diff --git a/app/helpers.php b/app/helpers.php
index a7720211..9a6346c5 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Support\Str;
+use Illuminate\Support\Arr;
 
 if (! function_exists('get_real_ip')) {
 
@@ -70,15 +71,20 @@ if (! function_exists('json')) {
 
     function json()
     {
-        @header('Content-type: application/json; charset=utf-8');
         $args = func_get_args();
 
         if (count($args) == 1 && is_array($args[0])) {
             return Response::json($args[0]);
-        } elseif(count($args) == 2) {
-            return Response::json([
+        } elseif (count($args) == 3 && is_array($args[2])) {
+            // the third argument is array of extra fields
+            return Response::json(array_merge([
                 'errno' => $args[1],
                 'msg'   => $args[0]
+            ], $args[2]));
+        } else {
+            return Response::json([
+                'errno' => Arr::get($args, 1, 1),
+                'msg'   => $args[0]
             ]);
         }
     }