lib/flok/user_compiler.rb in flok-0.0.57 vs lib/flok/user_compiler.rb in flok-0.0.60

@@ -460,10 +460,12 @@
     #But these defs. live in the UserCompilerController instance and we need
     #to delegate these calls to the controller that are not available in the action
     def method_missing method, *args, &block
       if macro = @controller.macros[method]
         #Call the macro in our context
-        self.instance_eval(&macro)
+        @current_action = name
+          self.instance_eval(&macro)
+        @current_action = nil
       else
         raise "No macro found named: #{method}"
       end
     end
   end