deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Upstream Patch: Enable SYSMODS to hold upstream modules

Browse Source
This commit is contained in:
Deon George
2010-08-21 15:18:16 +10:00
parent d2fc6d4d47
commit 6fb7d0035a
3 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/kohana/system/classes/kohana/core.php
View File

@@ -570,6 +570,13 @@ class Kohana_Core {
}
// Add the module to include paths
$paths[] = realpath(MODPATH.$path).DIRECTORY_SEPARATOR;
// Add our system modules path
}
if (is_dir(SMDPATH.$path))
{
// Add the module to include paths
$paths[] = realpath(SMDPATH.$path).DIRECTORY_SEPARATOR;
}
}
@@ -1383,11 +1390,15 @@ class Kohana_Core {
{
$file = 'SYSPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SYSPATH));
}
elseif (strpos($file, SMDPATH) === 0)
{
$file = 'SMDPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(SMDPATH));
}
elseif (strpos($file, MODPATH) === 0)
{
$file = 'MODPATH'.DIRECTORY_SEPARATOR.substr($file, strlen(MODPATH));
}
elseif (strpos($file, OVERPATH) === 0)
elseif (OVERPATH AND strpos($file, OVERPATH) === 0)
{
$file = 'OVERPATH/'.substr($file, strlen(OVERPATH));
}