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

More fixes related to password reset

Browse Source
This commit is contained in:
Deon George
2013-04-21 23:10:38 +10:00
parent 79c76995b9
commit 3ce74636f7
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/classes/Controller/TemplateDefault.php
View File

@@ -17,7 +17,7 @@ class Controller_TemplateDefault extends lnApp_Controller_TemplateDefault {
public function __construct(Request $request, Response $response) {
if (Config::theme())
$this->template = 'theme/'.Config::theme().'/page';
$this->template = Config::theme().'/page';
return parent::__construct($request,$response);
}
@@ -56,6 +56,7 @@ class Controller_TemplateDefault extends lnApp_Controller_TemplateDefault {
throw new Kohana_Exception('Class has no security defined :class, or no security configured for :method',array(':class'=>get_class($this),':method'=>Request::current()->action()));
$this->ao = Auth::instance()->get_user();
if (! is_null($this->ao) AND (is_string($this->ao) OR ! $this->ao->loaded()))
throw HTTP_Exception::factory(501,'Account doesnt exist :account ?',array(':account'=>(is_string($this->ao) OR is_null($this->ao)) ? $this->ao : Auth::instance()->get_user()->id));
}