From 08c8c3dbb96f203f72ff7222d14833b48eb63086 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 01 Jul 2009 10:39:00 -0400
Subject: [PATCH] Move 'login' field to the right level + codestyle
---
program/include/rcmail.php | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index ea53d91..22ec20b 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -301,10 +301,6 @@
if (!($this->output instanceof rcube_template))
$this->output = new rcube_template($this->task, $framed);
- foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) {
- $this->output->set_env($js_config_var, $this->config->get($js_config_var));
- }
-
// set keep-alive/check-recent interval
if ($keep_alive = $this->config->get('keep_alive')) {
// be sure that it's less than session lifetime
@@ -321,7 +317,7 @@
$this->output->set_env('task', $this->task);
$this->output->set_env('action', $this->action);
$this->output->set_env('comm_path', $this->comm_path);
- $this->output->set_charset($this->config->get('charset', RCMAIL_CHARSET));
+ $this->output->set_charset(RCMAIL_CHARSET);
// add some basic label to client
$this->output->add_label('loading', 'servererror');
--
Gitblit v1.9.1