Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit f52e2f12da7a · 2012-11-22T18:37:51.000-05:00
diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst
@@ -233,7 +233,7 @@ it in the view::
                 }
 
                 // set an "image_url" variable that will be available when rendering this field
-                $view->vars['image_url'] = $imageUrl;
+                $view->set('image_url', $imageUrl);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ it in the view::`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`// set an "image_url" variable that will be available when rendering this field`
`236`		`- $view->vars['image_url'] = $imageUrl;`
	`236`	`+ $view->set('image_url', $imageUrl);`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`