Merge pull request #45 from marc1706/master

Reverted changes to trim_message tool
This commit is contained in:
Marc Alexander
2012-01-02 11:43:55 -08:00
2 changed files with 3 additions and 1 deletions

View File

@@ -49,7 +49,7 @@ class phpbb_trim_message
*/
public function __construct($message, $bbcode_uid, $length, $append_str = ' [...]', $tolerance = 25)
{
$this->message = htmlspecialchars_decode($message);
$this->message = $message;
$this->bbcode_uid = $bbcode_uid;
$this->append_str = $append_str;
$this->length = (int) $length;

View File

@@ -401,6 +401,8 @@ function get_sub_taged_string($message, $bbcode_uid, $length)
{
global $phpbb_root_path, $phpEx;
$message = htmlspecialchars_decode($message);
if(!class_exists('phpbb_trim_message'))
{
include($phpbb_root_path . 'includes/trim_message/trim_message.' . $phpEx);