diff --git a/fuel/app/classes/controller/admin.php b/fuel/app/classes/controller/admin.php index 9456e2e..9501665 100755 --- a/fuel/app/classes/controller/admin.php +++ b/fuel/app/classes/controller/admin.php @@ -22,8 +22,8 @@ class Controller_Admin extends Controller_Template Response::redirect('/home'); Lang::load('menu'); - Lang::load('action'); - + Lang::load('action'); + $this->template->user = Session::get('user'); $this->template->js_bottom = ['plex_alert.js']; diff --git a/fuel/app/classes/controller/rest/movie.php b/fuel/app/classes/controller/rest/movie.php index 22ee1f1..53818b2 100644 --- a/fuel/app/classes/controller/rest/movie.php +++ b/fuel/app/classes/controller/rest/movie.php @@ -21,7 +21,7 @@ class Controller_Rest_Movie extends Controller_Rest if (!$movie) throw new FuelException('No movie found'); - $user_settings = Model_Settings::find_one_by('user_id', Session::get('user')->id); + $user_settings = Model_Setting::find_one_by('user_id', Session::get('user')->id); if ($movie->type !== 'movie') $episodes = $movie->getSeason()->getEpisodes();