porting #668 to 1.6.x

2012-06-29 18:27:11 +07:00
parent 1e89b31bad
commit ce7d3fecdb
2 changed files with 11 additions and 1 deletions
--- a/lib/cancan/controller_resource.rb
+++ b/lib/cancan/controller_resource.rb
@@ -220,7 +220,7 @@ module CanCan
    end

    def namespace
-      @params[:controller].split("::")[0..-2]
+      @params[:controller].split(/::|\//)[0..-2]
    end

    def namespaced_name