------------------------------------------------------------
revno: 906
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sun 2011-10-09 00:38:07 +0200
message:
extensions-dir added
modified:
src/libs/aiki.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'src/libs/aiki.php'
--- src/libs/aiki.php 2011-10-05 21:27:43 +0000
+++ src/libs/aiki.php 2011-10-08 22:38:07 +0000
@@ -87,15 +87,26 @@
return false;
}
}
-
- if(file_exists($AIKI_ROOT_DIR."/assets/extensions/{$class}.php")) {
- require_once($AIKI_ROOT_DIR."/assets/extensions/{$class}.php");
- } elseif (file_exists( $AIKI_ROOT_DIR.'/assets/extensions/{$class}/{$class}.php')) {
- require_once($AIKI_ROOT_DIR."/assets/extensions/{$class}/{$class}.php");
- } else {
- return false;
- }
-
+
+ // search in dirs
+ $SearchIn = $this->config->get("extensions-dir","assets/extensions");
+ $loaded = false;
+ foreach ( explode(",", $SearchIn) as $dir ) {
+ if(file_exists($AIKI_ROOT_DIR. "/$dir/$class.php")) {
+ require_once($AIKI_ROOT_DIR."/$dir/$class.php");
+ $loaded= true;
+ break;
+ }
+ if(file_exists($AIKI_ROOT_DIR. "/$dir/$class/$class.php")) {
+ require_once($AIKI_ROOT_DIR."/$dir/$class/$class.php");
+ $loaded= true;
+ break;
+ }
+
+ }
+ if (!$loaded){
+ return false;
+ }
}
$object = new $class();
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
