From 41c5abd4e8849e6a84ed2af405e9c25a74e018f3 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sun, 22 Sep 2013 17:09:57 +0200
Subject: Move user_logged_in check to controller constructor

TL;DR: Allows us to show a proper error page if encryption_key is
missing from the config.

muser->logged_in() can load the session class which will die if
encryption_key is not set in the config causing an error to be
displayed.

Because the header is also loaded when we display an error
loading the class will be tried again. CI maintains an array with
information which classes have been tried to be loaded and will simply
return true without loading again.

muser->logged_in() will then try to access $this->session which doesn't
exist. Since all of this happens when we are already in the header the
error message appears in the navigation being hard to read.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/file/upload_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/views/file')

diff --git a/application/views/file/upload_form.php b/application/views/file/upload_form.php
index a977aaa92..b472bcc10 100644
--- a/application/views/file/upload_form.php
+++ b/application/views/file/upload_form.php
@@ -1,4 +1,4 @@
-<?php if (user_logged_in()) { ?>
+<?php if (isset($user_logged_in) && $user_logged_in) { ?>
 <div class="well">
 	<div class="row">
 		<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-upload-form">
-- 
cgit v1.2.3-24-g4f1b