summaryrefslogtreecommitdiff
path: root/modules/user/helpers/user.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-03-16 08:05:07 +0000
committerBharat Mediratta <bharat@menalto.com>2009-03-16 08:05:07 +0000
commit54e07d07691be42f606b5a5346bf956257c598bd (patch)
treea06ca18a78c0970f7ac63669ec08fdd288f692fb /modules/user/helpers/user.php
parentdf5f035ed17ef7873e40b026052af4e8cc2be6e4 (diff)
Get rid of the extra robust code we had in here to make the
scaffolding work when the Gallery wasn't installed yet. Now we force users through the installer.
Diffstat (limited to 'modules/user/helpers/user.php')
-rw-r--r--modules/user/helpers/user.php12
1 files changed, 1 insertions, 11 deletions
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index dbb9b613..93f07629 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -113,17 +113,7 @@ class user_Core {
* Make sure that we have a session and group_ids cached in the session.
*/
static function load_user() {
- // This is one of the first session operations that we'll do, so it may fail if there's no
- // install yet. Try to handle this situation gracefully expecting that the scaffolding will
- // Do The Right Thing.
- //
- // @todo get rid of this extra error checking when we have an installer.
- try {
- $session = Session::instance();
- } catch (Exception $e) {
- return;
- }
-
+ $session = Session::instance();
if (!($user = $session->get("user"))) {
$session->set("user", $user = user::guest());
}