mirror of
				https://github.com/sinatra/sinatra
				synced 2023-03-27 23:18:01 -04:00 
			
		
		
		
	Fix capture bug with slim from patch by @minad
See judofyr/temple#86 Closes #156 Closes #145
This commit is contained in:
		
							parent
							
								
									a58445b914
								
							
						
					
					
						commit
						43797c99fe
					
				
					 2 changed files with 1 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -2,7 +2,6 @@ source "https://rubygems.org" unless ENV['QUICK']
 | 
			
		|||
gemspec
 | 
			
		||||
 | 
			
		||||
gem 'sinatra', :github => 'sinatra/sinatra'
 | 
			
		||||
gem 'temple', :github => 'zzak/temple', :branch => '0-6-patched'
 | 
			
		||||
 | 
			
		||||
group :development, :test do
 | 
			
		||||
  platform :ruby_18, :jruby do
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,7 +95,7 @@ module Sinatra
 | 
			
		|||
      @capture = nil
 | 
			
		||||
      if current_engine == :ruby
 | 
			
		||||
        result = block[*args]
 | 
			
		||||
      elsif current_engine == :erb
 | 
			
		||||
      elsif current_engine == :erb || current_engine == :slim
 | 
			
		||||
        @_out_buf, _buf_was = '', @_out_buf
 | 
			
		||||
        block[*args]
 | 
			
		||||
        result = eval('@_out_buf', block.binding)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue