Merge branch '2.0'

Conflicts: Form/Type/CKEditorType.php
egeloen · Mar 18, 2013 · 9f2ddcc · 9f2ddcc
2 parents d12a163 + 195c5ae
commit 9f2ddcc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Form/Type/CKEditorType.php b/Form/Type/CKEditorType.php
@@ -257,7 +257,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             );
 
             $view->vars['js_path'] = $this->assetsHelper->getUrl($form->getConfig()->getAttribute('js_path'));
-            $view->vars['config'] = json_encode($form->getConfig()->getAttribute('config'), JSON_FORCE_OBJECT);
+            $view->vars['config'] = json_encode($form->getConfig()->getAttribute('config'));
             $view->vars['plugins'] = $form->getConfig()->getAttribute('plugins');
         }
     }