diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
| commit | c6fd65ef7639cd67487c831db10dd79e4510efa6 (patch) | |
| tree | 2c825413c26df7d0c5394d01c2599003cab87c0b /app/views/helpers/javascript_vars.phtml | |
| parent | 93f7f849874dcdf1263370ff08c72a962f8de56f (diff) | |
| parent | 17c3e616e8c3b927ee46258a8b8b20371bf59592 (diff) | |
Resolve git conflict
Diffstat (limited to 'app/views/helpers/javascript_vars.phtml')
| -rw-r--r-- | app/views/helpers/javascript_vars.phtml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml index 6178cacf2..1aa43a207 100644 --- a/app/views/helpers/javascript_vars.phtml +++ b/app/views/helpers/javascript_vars.phtml @@ -1,6 +1,5 @@ <?php $mark = FreshRSS_Context::$user_conf->mark_when; -$mail = Minz_Session::param('mail', false); $s = FreshRSS_Context::$user_conf->shortcuts; echo htmlspecialchars(json_encode(array( 'context' => array( @@ -16,7 +15,6 @@ echo htmlspecialchars(json_encode(array( 'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(), 'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout, 'auth_type' => FreshRSS_Context::$system_conf->auth_type, - 'current_user_mail' => $mail ? ('"' . $mail . '"') : null, 'current_view' => Minz_Request::actionName(), ), 'shortcuts' => array( |