From 731ddee93f22b01de19e2a96ccece328ad0f1c8f Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Tue, 4 Feb 2014 10:38:02 -0400 Subject: [PATCH] Adding rbac/classes/model to autoloading... --- gulliver/system/class.bootstrap.php | 9 --------- workflow/public_html/sysGeneric.php | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php index 098c01dd5..257948e94 100644 --- a/gulliver/system/class.bootstrap.php +++ b/gulliver/system/class.bootstrap.php @@ -27,15 +27,6 @@ class Bootstrap return true; } - // try resolve a Model class file - $classFile = PATH_CORE . 'classes' . PATH_SEP . 'model' . PATH_SEP . $class . '.php'; - - if (file_exists($classFile)) { - require_once $classFile; - - return true; - } - $classHasNamespaceSeparator = strpos($class, '\\') !== false ? true : false; foreach (BootStrap::$includePaths as $path) { diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php index 1136e36df..48f43dedd 100755 --- a/workflow/public_html/sysGeneric.php +++ b/workflow/public_html/sysGeneric.php @@ -513,6 +513,8 @@ try { Bootstrap::registerSystemClasses(); Bootstrap::registerDir('src', PATH_HOME . 'engine/src/'); + Bootstrap::registerDir('model', PATH_CORE . 'classes' . PATH_SEP . 'model'); + Bootstrap::registerDir('rbac/model', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model'); require_once PATH_THIRDPARTY . '/pear/PEAR.php';