summaryrefslogtreecommitdiff
path: root/modules/gallery/views
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-29 22:28:48 -0700
committerBharat Mediratta <bharat@menalto.com>2009-05-29 22:28:48 -0700
commitf660eb55aa9535c10f91ad2812fa073589fcae2b (patch)
tree11d8727061378408bbc16ede888a058ba20542fb /modules/gallery/views
parent0097803efc1c71711bf9ccf5015fe43e75f8f28d (diff)
parentce285b8feba2f9c495fb153517c2a582421f50e0 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
-rw-r--r--modules/gallery/views/kohana_error_page.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php
index a091bca3..d9bf9698 100644
--- a/modules/gallery/views/kohana_error_page.php
+++ b/modules/gallery/views/kohana_error_page.php
@@ -58,9 +58,8 @@
<title><?= t("Something went wrong!") ?></title>
</head>
<body>
-<? // try { $user = user::active(); } catch (Exception $e) { } ?>
-<? // $admin = isset($user) && $user->admin ?>
-<? $admin = 1; ?>
+ <? try { $user = user::active(); } catch (Exception $e) { } ?>
+ <? $admin = isset($user) && $user->admin ?>
<div class="big_box" id="framework_error">
<h1>
<?= t("Dang... Something went wrong!") ?>