padrino-admin.rb in padrino-admin-0.9.11

- old
+ new

@@ -1,11 +1,11 @@
 require 'padrino-core'
 require 'padrino-gen'
 require 'padrino-helpers'
 
-Dir[File.dirname(__FILE__) + '/padrino-admin/*.rb'].each { |file| require file }
-Dir[File.dirname(__FILE__) + '/padrino-admin/{helpers,utils}/*.rb'].each { |file| require file }
+FileSet.glob_require('padrino-admin/*.rb', __FILE__)
+FileSet.glob_require('padrino-admin/{helpers,utils}/*.rb', __FILE__)
 
 module Padrino
   ##
   # Padrino::Admin is beautiful Ajax Admin, with these fatures:
   #
@@ -19,14 +19,9 @@
 
 ##
 # We need to apply Padrino::Admin::Utils::Extensions
 #
 String.send(:include, Padrino::Admin::Utils::Crypt)
-
-##
-# We need to add to Padrino::Application a +access_control+ class
-#
-Padrino::Application.extend(Padrino::Admin::AccessControl::ClassMethods)
 
 ##
 # Load our Padrino::Admin locales
 #
 I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-admin/locale/**/*.yml"]
\ No newline at end of file