wip #5023 @0.5

diff --git a/src/Json.php b/src/Json.php
index ea507668624b206d9f38a31c48987f6beb746227..fdc179f67edc5b7d88bb4aa59f4cf692c7d107ef 100644 (file)
--- a/src/Json.php
+++ b/src/Json.php
@@ -51,10 +51,13 @@ class Json
     {
         $v = $encodedValue;
         if (is_string($encodedValue)) {
-            $v = json_decode($encodedValue);
-
-            if (!$v) {
-                return $encodedValue;
+            if (self::isJson($encodedValue)) {
+                $v = json_decode($encodedValue);
+                if (!$v) {
+                    return $encodedValue;
+                }
+            } else {
+                return $v;
             }
         }