0
@@ -82,7 +82,7 @@ class MephistoController < ApplicationController
0
     end
0
     
0
     def paged_search_url_for(page)
0
-      page ? paged_search_url(:q => params[:q], :page => page) : ''
0
+      page ? search_url(:q => params[:q], :page => page) : ''
0
     end
0
     
0
     def paged_monthly_url_for(page)

0
@@ -23,21 +23,20 @@ ActionController::Routing::Routes.draw do |map|
0
   map.with_options :controller => 'mephisto' do |m|
0
     m.article ':year/:month/:day/:permalink', :action => 'show',    
0
       :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
-  
0
-    m.daily   ':year/:month/:day',            :action => 'day',  
0
-      :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
-  
0
-    m.paged_monthly ':year/:month/page/:page', :action => 'month', 
0
-      :year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
0
-  
0
+
0
     m.monthly ':year/:month',                 :action => 'month', 
0
       :year => /\d{4}/, :month => /\d{1,2}/
0
+
0
+    m.paged_monthly ':year/:month/page/:page', :action => 'month', 
0
+      :year => /\d{4}/, :month => /\d{1,2}/, :page => /\d+/
0
+
0
+    m.daily   ':year/:month/:day',            :action => 'day',  
0
+      :year => /\d{4}/, :month => /\d{1,2}/, :day => /\d{1,2}/
0
   
0
     m.yearly  ':year',                        :action => 'yearly',  
0
-    :year => /\d{4}/
0
+      :year => /\d{4}/
0
   
0
-    m.paged_search 'search/:q/page/:page', :action => 'search'
0
-    m.search       'search/:q',            :action => 'search', :q => nil
0
-    m.section      '*sections',            :action => 'list'
0
+    m.search  'search',    :action => 'search'
0
+    m.section '*sections', :action => 'list'
0
   end
0
 end

0
@@ -18,7 +18,6 @@ class MephistoControllerTest < Test::Unit::TestCase
0
     with_options :controller => 'mephisto' do |test|
0
       test.assert_routing '',               :action => 'list',   :sections => []
0
       test.assert_routing 'about',          :action => 'list',   :sections => %w(about)
0
-      test.assert_routing 'search/foo',     :action => 'search', :q => 'foo'
0
       test.assert_routing '2006',           :action => 'yearly', :year => '2006'
0
       test.assert_routing '2006/01',        :action => 'month',  :year => '2006', :month => '01'
0
       test.assert_routing '2006/01/page/1', :action => 'month',  :year => '2006', :month => '01', :page => '1'