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

Enabled Search, Improved Navbar, Fixed Application Authorisation and some other minor fixes

Browse Source
This commit is contained in:
Deon George
2013-05-08 19:00:47 +10:00
parent 026b07a695
commit d1c0d48250
27 changed files with 877 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/classes/Config.php
View File

@@ -172,7 +172,7 @@ class Config extends Kohana_Config {
public static function 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')))
if (Request::current() AND (! 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;