lib/ramaze/action.rb in manveru-ramaze-2008.07 vs lib/ramaze/action.rb in manveru-ramaze-2008.08

@@ -39,11 +39,11 @@
         stack.last
       end
 
       # Return the stacked actions for the current request
       def stack
-        Thread.current[:action_stack] ||= []
+        STATE[:action_stack] ||= []
       end
     end
 
     # nicer representation of the Action
 
@@ -114,10 +114,10 @@
       File.basename((self[:method] || self[:template]).to_s).split('.').first
     end
 
     # combined path to current action, from path and params
     def extended_path
-      Array[path, *params].join('/')
+      (path == "index" && !params.empty? ? params : Array[path, *params]).join('/')
     end
 
     def full_path
       self.controller.mapping/extended_path
     end