aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorPhilip Arndt <parndt@gmail.com>2010-11-22 15:28:06 +1300
committerPhilip Arndt <parndt@gmail.com>2010-11-22 15:28:06 +1300
commitc67c282bc47e4c0e00e91653ed4247029ef8f6f7 (patch)
treea0b273de5014af3da36b4e637632d5bb7a945fe2 /config
parente5b9af1054bbd259bde0265acf4386cdaab0ca41 (diff)
parent6a71948d0a33c71e3d441ae0d9d7de5f0183eb3b (diff)
downloadrefinerycms-blog-c67c282bc47e4c0e00e91653ed4247029ef8f6f7.tar.gz
refinerycms-blog-c67c282bc47e4c0e00e91653ed4247029ef8f6f7.tar.bz2
refinerycms-blog-c67c282bc47e4c0e00e91653ed4247029ef8f6f7.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 01fb501..f3dddd4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,8 +6,8 @@ if Rails.version < '3.0.0'
blog.post ':id', :controller => "posts", :action => 'show'
blog.category 'categories/:id', :controller => "categories", :action => 'show'
blog.post_blog_comments ':id/comments', :controller => 'posts', :action => 'comment'
-
-
+
+
## what is the rails2 syntax for this? sorry ;__;
# get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
end
@@ -45,7 +45,7 @@ else
end
scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
- scope(:path => 'blog', :name_prefix => 'admin', :as => 'blog', :module => 'blog') do
+ scope(:path => 'blog', :as => 'blog', :module => 'blog') do
root :to => 'posts#index'
resources :posts