Merge branch 'stable'

Conflicts: doc-src/HAML_CHANGELOG.md
jay3126 · Dec 29, 2010 · 87c0810 · 87c0810
2 parents 0afadc6 + 5c34fe2
commit 87c0810
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/doc-src/HAML_CHANGELOG.md b/doc-src/HAML_CHANGELOG.md
@@ -22,6 +22,10 @@
 
 * Drop support for Hpricot 0.7. 0.8 has been out for nearly two years.
 
+## 3.0.26 (Unreleased)
+
+* Allow custom filters to be loaded from the command line.
+
 ## 3.0.25
 
 [Tagged on GitHub](http://github.com/nex3/haml/commit/3.0.25).

diff --git a/lib/haml/exec.rb b/lib/haml/exec.rb
@@ -263,16 +263,16 @@ def process_result
         template = input.read()
         input.close() if input.is_a? File
 
+        @options[:load_paths].each {|p| $LOAD_PATH << p}
+        @options[:requires].each {|f| require f}
+
         begin
           engine = ::Haml::Engine.new(template, @options[:for_engine])
           if @options[:check_syntax]
             puts "Syntax OK"
             return
           end
 
-          @options[:load_paths].each {|p| $LOAD_PATH << p}
-          @options[:requires].each {|f| require f}
-
           if @options[:debug]
             puts engine.precompiled
             puts '=' * 100