Changeset 1208

Timestamp:

01/08/08 17:47:13 (11 months ago)

Author:

wyca..@gmail.com

Message:

Fix inline partial and server.rb

Files:

• trunk/lib/merb/mixins/inline_partial.rb (modified) (1 diff)
• trunk/lib/merb/server.rb (modified) (1 diff)

trunk/lib/merb/mixins/inline_partial.rb

@@ -12 +12 @@
-
-    unless self.respond_to?(template_method)
-
+return 
-    end
-

trunk/lib/merb/server.rb

@@ -366 +366 @@
-        @app_loaded = true
-        (@after_app_blocks || []).each { |b| b.call }
+        require "sass/plugin" if File.directory?(MERB_ROOT / "public" / "stylesheets" / "sass")        
-      end
-