Fixes from live website

This commit is contained in:
Deon George
2013-04-20 11:40:44 +10:00
parent 13982be9f6
commit 79c76995b9
22 changed files with 283 additions and 55 deletions

View File

@@ -105,6 +105,7 @@ class Controller_Admin_Welcome extends Controller_Welcome {
));
// We are a site administrator
$output = '';
if ($this->ao->rtm_id == NULL) {
$rtmo = ORM::factory('RTM',array('account_id','=',$this->ao->id))->find();
@@ -116,7 +117,7 @@ class Controller_Admin_Welcome extends Controller_Welcome {
->set('o',$rtmo);
} else {
$rtmo = ORM::factory('RTM',$this->ao->rmt_id);
$rtmo = ORM::factory('RTM',$this->ao->rtm_id);
}
if ($output)