From ddafe4e4109a8d6d412c3c138412ee2ca3d58dbf Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 27 Oct 2012 10:12:37 -0400
Subject: [PATCH] Merge branch 'dev-compose-newwindow'
---
program/include/rcube_output.php | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_output.php b/program/include/rcube_output.php
index e1d5e43..5c582e6 100644
--- a/program/include/rcube_output.php
+++ b/program/include/rcube_output.php
@@ -17,9 +17,6 @@
| Author: Thomas Bruederli <roundcube@gmail.com> |
| Author: Aleksander Machniak <alec@alec.pl> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
/**
@@ -47,7 +44,7 @@
*/
public function __construct($task = null, $framed = false)
{
- $this->app = rcmail::get_instance();
+ $this->app = rcube::get_instance();
$this->config = $this->app->config;
$this->browser = new rcube_browser();
}
--
Gitblit v1.9.1