Sync with latest simply_stored

2015-07-22 17:21:41 +02:00
parent 49b61a5026
commit f7aa44ae2e
8 changed files with 115 additions and 21 deletions
@@ -127,7 +127,7 @@ module Cmtool

    # Add extra helper method since cmtool layouts may be used outside the cmtool scope
    def cmtool_user
-      controller.send :cmtool_user
+      controller.respond_to?(:cmtool_user) ? controller.send(:cmtool_user) :nil
    end

    def edit_td(obj)