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

Fix password reset issues

Browse Source
This commit is contained in:
Deon George
2013-04-18 18:17:33 +10:00
parent 6cb3e55ca9
commit 13982be9f6
14 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/classes/Config.php
View File

@@ -163,7 +163,11 @@ class Config extends Kohana_Config {
}
public static function theme() {
return Kohana::$config->load('config')->theme;
// If we are using user admin pages (and login), we'll choose the admin theme.
if (! empty(URL::$method_directory[strtolower(Request::current()->directory())]) OR in_array(strtolower(Request::current()->controller()),array('login')))
return 'theme/'.Kohana::$config->load('config')->theme_admin;
else
return 'theme/'.Kohana::$config->load('config')->theme;
}
public static function time($date) {