Fix bug when using a comma in querybuilder options

Author: tobias-93

Twig/Extension/EchoExtension.php

@@ -70,6 +70,11 @@ public function convertAsForm($options, $formType)
         // Should we really check formType or can we just
         // look for query_builder option?
         if (preg_match("/EntityType$/i", $formType)) {
+            preg_match("/'query_builder' => '(.+?)}',/i", $options, $matches);
+
+            if (count($matches) > 0) {
+              $options = str_replace("'query_builder' => '$matches[1]}'", "'query_builder' => ".stripslashes($matches[1]).'}', $options);
+            }
             preg_match("/'query_builder' => '(.+?)',/i", $options, $matches);
 
             if (count($matches) > 0) {
@@ -79,6 +84,11 @@ public function convertAsForm($options, $formType)
 
         // Same question here
         if (preg_match("/ModelType$/i", $formType)) {
+            preg_match("/'query' => '(.+?)}',/i", $options, $matches);
+
+            if (count($matches) > 0) {
+                $options = str_replace("'query' => '$matches[1]}'", "'query' => ".stripslashes($matches[1]).'}', $options);
+            }
             preg_match("/'query' => '(.+?)',/i", $options, $matches);
 
             if (count($matches) > 0) {