Merge branch 'development' of git://github.com/cykod/Webiva into blog…

…-wizard-changes
cykod · Aug 3, 2010 · 6479814 · 6479814
2 parents af79239 + 4ef03a3
commit 6479814
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb
@@ -36,7 +36,12 @@ def stylesheet
         return
       end
     end
-
+
+    get_handlers(:stylesheet,:post_process).each do |req|
+      cls = req[0].constantize.new(self)
+      @css = cls.post_process_stylesheet @css
+    end
+
     render :layout=> false, :text => @css
   end
 

diff --git a/vendor/modules/blog/app/controllers/blog/page_renderer.rb b/vendor/modules/blog/app/controllers/blog/page_renderer.rb
@@ -50,6 +50,7 @@ def entry_list
     end
 
     if list_type == 'category'
+      list_type_identifier = list_type_identifier.to_s.gsub("+"," ")
       set_page_connection(:category, list_type_identifier)
     end
 
@@ -106,7 +107,7 @@ def entry_detail
     result = renderer_cache(blog, display_string) do |cache|
       entry = nil
       if editor?
-        entry = blog.blog_posts.find(:first,:conditions => ['blog_posts.status  "published" AND blog_blog_id=? ',blog.id])
+        entry = blog.blog_posts.find(:first,:conditions => ['blog_posts.status = "published" AND blog_blog_id=? ',blog.id])
       elsif conn_type == :post_permalink
         entry = blog.find_post_by_permalink(conn_id)
       end