public
Fork of wycats/merb-core
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/auser/merb-core.git
Search Repo:
catch_content should default to :for_layout

render throws the rendered content as :for_layout now, so catch_content
should catch that by default
ivey (author)
Wed Mar 12 22:08:52 -0700 2008
commit  c25e77fc8ededd692306415be837df971a7d72c2
tree    406408570014c24c6a69afa8f00dc2f641368f8f
parent  0a15099a76e50b6d3419a81c2acdb6b9214e0a71
...
284
285
286
287
288
289
 
 
 
290
291
292
 
293
294
295
 
296
297
298
...
321
322
323
324
325
 
...
284
285
286
 
 
 
287
288
289
290
291
 
292
293
294
 
295
296
297
298
...
321
322
323
 
324
325
0
@@ -284,15 +284,15 @@ module Merb::RenderMixin
0
   end
0
     
0
   # Called in templates to get at content thrown in another template. The
0
- # results of rendering a template are automatically thrown into :layout, so
0
- # catch_content or catch_content(:layout) can be used inside layouts to get
0
- # the content rendered by the action template.
0
+ # results of rendering a template are automatically thrown into :for_layout,
0
+ # so catch_content or catch_content(:for_layout) can be used inside layouts
0
+ # to get the content rendered by the action template.
0
   #
0
   # ==== Parameters
0
- # obj<Object>:: The key in the thrown_content hash. Defaults to :layout.
0
+ # obj<Object>:: The key in the thrown_content hash. Defaults to :for_layout.
0
   #---
0
   # @public
0
- def catch_content(obj = :layout)
0
+ def catch_content(obj = :for_layout)
0
     @_caught_content[obj]
0
   end
0
   
0
@@ -321,4 +321,4 @@ module Merb::RenderMixin
0
     @_caught_content[obj] = string.to_s << (block_given? ? capture(&block) : "")
0
   end
0
   
0
-end
0
\ No newline at end of file
0
+end

Comments

    No one has commented yet.