Merge branch 'master' of git@github.com:knewter/ansuz

knewter · Oct 15, 2008 · 543d316 · 543d316
2 parents 6e58d41 + 692d80d
commit 543d316
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/vendor/plugins/ansuz_blog/app/controllers/articles_controller.rb b/vendor/plugins/ansuz_blog/app/controllers/articles_controller.rb
@@ -7,7 +7,7 @@ class ArticlesController < ApplicationController
 
   protected
   def load_blog_posts
-    @blog_posts = Ansuz::JAdams::BlogPost.find(:all)
+    @blog_posts = Ansuz::JAdams::BlogPost.find(:all, :order => 'created_at DESC')
   end
 
   def load_blog_post

diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb
@@ -0,0 +1,7 @@
+begin
+  require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here
+rescue LoadError
+  require 'haml' # From gem
+end
+
+Haml.init_rails(binding)