Permalink
Browse files

Removing rules loading logic from ACL::instance() and config.

  • Loading branch information...
1 parent e10414e commit 23eb0ba3286646a5e9dce334497acc0d75e3666b @jeremeamia jeremeamia committed Aug 9, 2010
Showing with 0 additions and 11 deletions.
  1. +0 −6 classes/kohana/acl.php
  2. +0 −5 config/acl.php
@@ -80,12 +80,6 @@ public static function instance($parts = NULL)
$parts = Arr::extract($parts, array('directory', 'controller', 'action'));
}
- // Load rules from a file
- if (empty(self::$_rules) AND Kohana::config('acl.rule_declarations'))
- {
- include APPPATH.Kohana::config('acl.rule_declarations').EXT;
- }
-
// Use the imploded request parts as the key for this instance
$key = implode('/', $parts);
View
@@ -13,11 +13,6 @@
'super_role' => 'developer',
/**
- * The path to the rule declarations file (from APPPATH)
- */
- 'rule_declarations' => 'acl',
-
- /**
* `TRUE` if your application is using capabilities
*/
'support_capabilities' => TRUE,

0 comments on commit 23eb0ba

Please sign in to comment.