From a2e09c950d8716346b151f7980df1b51ebfbdd78 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 15 Apr 2014 12:35:33 -0400
Subject: [PATCH] Use methods chaining, don't use deprecated row_init method
---
program/include/bc.php | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/program/include/bc.php b/program/include/bc.php
index 5047e0a..2cb1517 100644
--- a/program/include/bc.php
+++ b/program/include/bc.php
@@ -22,7 +22,8 @@
/**
* Roundcube Webmail deprecated functions
*
- * @package Core
+ * @package Webmail
+ * @subpackage Legacy
* @author Thomas Bruederli <roundcube@gmail.com>
*/
@@ -61,7 +62,7 @@
function rcmail_temp_gc()
{
- $rcmail = rcmail::get_instance()->temp_gc();
+ rcmail::get_instance()->gc_temp();
}
function rcube_charset_convert($str, $from, $to=NULL)
@@ -204,9 +205,9 @@
return rcmail::get_instance()->quota_content($attrib);
}
-function rcmail_display_server_error($fallback=null, $fallback_args=null)
+function rcmail_display_server_error($fallback=null, $fallback_args=null, $suffix='')
{
- rcmail::get_instance()->display_server_error($fallback, $fallback_args);
+ rcmail::get_instance()->display_server_error($fallback, $fallback_args, $suffix);
}
function rcmail_filetype2classname($mimetype, $filename)
@@ -286,7 +287,7 @@
function rcube_check_referer()
{
- return rcmail::check_referer();
+ return rcube_utils::check_referer();
}
function rcube_timer()
@@ -399,7 +400,29 @@
return rcube_utils::get_boolean($str);
}
+function enriched_to_html($data)
+{
+ return rcube_enriched::to_html($data);
+}
+
+function strip_quotes($str)
+{
+ return str_replace(array("'", '"'), '', $str);
+}
+
+function strip_newlines($str)
+{
+ return preg_replace('/[\r\n]/', '', $str);
+}
+
class rcube_html_page extends rcmail_html_page
{
-
+}
+
+class washtml extends rcube_washtml
+{
+}
+
+class html2text extends rcube_html2text
+{
}
--
Gitblit v1.9.1