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

12
kh.php
View File

@@ -15,6 +15,11 @@ $application = 'application';
*/
$modules = 'modules';
/**
* The directory in which upstream Kohana resources (modules) are located.
*/
$sysmodules = 'includes/kohana/modules';
/**
* The directory in which the Kohana resources are located. The system
* directory must contain the classes/kohana.php file.
@@ -70,6 +75,10 @@ if ( ! is_dir($application) AND is_dir(DOCROOT.$application))
if ( ! is_dir($modules) AND is_dir(DOCROOT.$modules))
$modules = DOCROOT.$modules;
// Make the system relative to the docroot
if ( ! is_dir($sysmodules) AND is_dir(DOCROOT.$sysmodules))
$sysmodules = DOCROOT.$sysmodules;
// Make the system relative to the docroot
if ( ! is_dir($system) AND is_dir(DOCROOT.$system))
$system = DOCROOT.$system;
@@ -81,6 +90,7 @@ if ( ! is_dir($override) AND is_dir(DOCROOT.$override))
// Define the absolute paths for configured directories
define('APPPATH', realpath($application).DIRECTORY_SEPARATOR);
define('MODPATH', realpath($modules).DIRECTORY_SEPARATOR);
define('SMDPATH', realpath($sysmodules).DIRECTORY_SEPARATOR);
define('SYSPATH', realpath($system).DIRECTORY_SEPARATOR);
if (is_dir(realpath($override)))
@@ -89,7 +99,7 @@ else
define('OVERPATH', '');
// Clean up the configuration vars
unset($application, $modules, $system, $override);
unset($application, $modules, $sysmodules, $system, $override);
if (file_exists('install'.EXT))
{