From bbc8565e5afa7e5352bc3aaf7cf067066ec6d4b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 04 Mar 2010 03:17:04 -0500
Subject: [PATCH] Flag original messages after sending a draft (#1486203)
---
program/lib/html2text.php | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index e78ea10..49c636f 100644
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@@ -468,10 +468,12 @@
// Run our defined search-and-replace
$text = preg_replace($this->search, $this->replace, $text);
- $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
// Replace known html entities
$text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
+
+ // Run our defined search-and-replace with callback
+ $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
// Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
$text = preg_replace('/&[^&;]+;/i', '', $text);
@@ -522,9 +524,9 @@
$this->_link_count++;
$this->_link_list .= "[" . $this->_link_count . "] $link\n";
$additional = ' [' . $this->_link_count . ']';
- } elseif ( substr($link, 0, 11) == 'javascript:' ) {
- // Don't count the link; ignore it
- $additional = '';
+ } elseif ( substr($link, 0, 11) == 'javascript:' ) {
+ // Don't count the link; ignore it
+ $additional = '';
// what about href="#anchor" ?
} else {
$this->_link_count++;
@@ -566,7 +568,7 @@
case 'b':
case 'strong':
return $this->_strtoupper($matches[2]);
- case 'hr':
+ case 'th':
return $this->_strtoupper("\t\t". $matches[2] ."\n");
case 'h':
return $this->_strtoupper("\n\n". $matches[2] ."\n\n");
--
Gitblit v1.9.1