From bf2f39ea6d2b49c7495a43cca19ab18f27f8292e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Sep 2008 09:02:02 -0400
Subject: [PATCH] - #1485290: Fix unread counter when displaying cached massage in preview panel - remove some empty lines in app.js
---
bin/html2text.php | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/bin/html2text.php b/bin/html2text.php
index 7f74ac6..478ccce 100644
--- a/bin/html2text.php
+++ b/bin/html2text.php
@@ -1,21 +1,11 @@
<?php
-require_once('../program/lib/html2text.inc');
+define('INSTALL_PATH', realpath('./../') . '/');
+require INSTALL_PATH.'program/include/iniset.php';
-$htmlText = $HTTP_RAW_POST_DATA;
-$converter = new html2text($htmlText);
+$converter = new html2text(html_entity_decode($HTTP_RAW_POST_DATA, ENT_COMPAT, 'UTF-8'));
header('Content-Type: text/plain; charset=UTF-8');
-$plaintext = $converter->get_text();
-
-$phpver = explode('.', phpversion());
-$vernum = $phpver[0] . $phpver[1] . $phpver[2];
-
-# html_entity_decode doesn't handle UTF character sets in PHP 4.x
-
-if (($vernum >= 500) && function_exists('html_entity_decode'))
- print html_entity_decode($plaintext, ENT_COMPAT, 'UTF-8');
-else
- print $plaintext;
+print trim($converter->get_text());
?>
--
Gitblit v1.9.1