Changeset 28

Timestamp:

11/30/04 17:10:32 (4 years ago)

Author:

david

Message:

Silenced warnings from reloading files

Files:

• trunk/actionpack/lib/action_controller.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/support/misc.rb (added)

trunk/actionpack/lib/action_controller.rb

@@ -25 +25 @@
-
-require 'action_controller/support/clean_logger'
+require 'action_controller/support/misc'
-
-require 'action_controller/base'

trunk/actionpack/lib/action_controller/base.rb

@@ -258 +258 @@
-      # Loads the <tt>file_name</tt> if reload_dependencies is true or requires if it's false.
-      def require_or_load(file_name)
-load("#{file_name}.rb")
+silence_warnings { load("#{file_name}.rb") }
-      end
-    end