diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-05 07:27:23 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-05 07:27:23 +0000 |
| commit | 061a1ec3e3a178ea7ec559099433100b2113d70b (patch) | |
| tree | 8a9c34e984e9df616aef9134af5182274bdae5e4 /roundcubemail/program | |
| parent | add0b05da6b9279d3e6442ee4c48c0c37372be5c (diff) | |
Killed one more global var + log logins to a separate file (not console)
git-svn-id: https://svn.roundcube.net/trunk@1735 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/main.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_json_output.php | 1 | ||||
| -rwxr-xr-x | roundcubemail/program/include/rcube_template.php | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/list.inc | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index 3fad9cbfb..a6ad93d2b 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -317,7 +317,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE) $is_iso_8859_1 = true; } if (!$enctype) - $enctype = $GLOBALS['OUTPUT_TYPE']; + $enctype = $OUTPUT->type; // encode for plaintext if ($enctype=='text') diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php index fa5632929..00b7697bd 100644 --- a/roundcubemail/program/include/rcube_json_output.php +++ b/roundcubemail/program/include/rcube_json_output.php @@ -34,6 +34,7 @@ class rcube_json_output private $texts = array(); private $commands = array(); + public $type = 'js'; public $ajax_call = true; diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php index 847ea0df5..3fdd81762 100755 --- a/roundcubemail/program/include/rcube_template.php +++ b/roundcubemail/program/include/rcube_template.php @@ -39,6 +39,7 @@ class rcube_template extends rcube_html_page var $js_commands = array(); var $object_handlers = array(); + public $type = 'html'; public $ajax_call = false; /** diff --git a/roundcubemail/program/steps/mail/list.inc b/roundcubemail/program/steps/mail/list.inc index e09919cb2..201437190 100644 --- a/roundcubemail/program/steps/mail/list.inc +++ b/roundcubemail/program/steps/mail/list.inc @@ -19,7 +19,6 @@ */ -$OUTPUT_TYPE = 'js'; // is there a sort type for this request? if ($sort = get_input_value('_sort', RCUBE_INPUT_GET)) { |