Merge remote-tracking branch 'origin/1.3' into update-from-1.3

dbu · dbu · commit 7361577317d7 · 2016-01-09T11:51:47.000+01:00
Conflicts:
	Admin/RouteAdmin.php
	Doctrine/Phpcr/LocaleListener.php
diff --git a/Admin/RouteAdmin.php b/Admin/RouteAdmin.php
@@ -174,7 +174,7 @@ protected function configureFieldsForDefaults($dynamicDefaults)
             $defaults['_format'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => true));
         }
         if ($route && $route->getOption('add_locale_pattern')) {
-            $defaults['_locale'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));
+            $defaults['_locale'] = array('_locale', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));
         }
 
         return $defaults;

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ protected function configureFieldsForDefaults($dynamicDefaults)`
`174`	`174`	`$defaults['_format'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => true));`
`175`	`175`	`}`
`176`	`176`	`if ($route && $route->getOption('add_locale_pattern')) {`
`177`		`- $defaults['_locale'] = array('_format', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));`
	`177`	`+ $defaults['_locale'] = array('_locale', Sf2CompatUtil::getFormTypeName('text'), array('required' => false));`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`return $defaults;`