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

Improvements to payment and other misc items

Browse Source
This commit is contained in:
Deon George
2013-06-19 19:26:07 +10:00
parent 1caeed6606
commit 3499776ddc
33 changed files with 569 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/classes/Kohana.php
View File

@@ -34,13 +34,14 @@ abstract class Kohana extends Kohana_Core {
if (! in_array($dir,$dirs) OR PHP_SAPI === 'cli')
return parent::find_file($dir,$file,$ext,$array);
$prefixes = array('');
// Our search order.
$prefixes = array(
sprintf('site/%s/%s/',Config::siteid(),Config::theme()),
sprintf('site/%s/',Config::siteid()),
Config::theme().'/',
'',
);
if (! preg_match('/^theme\//',$file)) {
array_unshift($prefixes,Config::theme().'/');
array_unshift($prefixes,sprintf('site/%s/',Config::siteid()));
array_unshift($prefixes,sprintf('site/%s/%s/',Config::siteid(),Config::theme()));
}
foreach ($prefixes as $p)
if ($x = parent::find_file($dir,$p.$file,$ext,$array))