From 485c80f39a1d2c86dfd93b0d9ebedaa4c3504332 Mon Sep 17 00:00:00 2001 From: fmarier Date: Fri, 22 May 2009 02:29:46 +0000 Subject: [PATCH] MDL-19266 lib/html2text: fix error in preg_replace_callback on php4 --- lib/html2text.php | 2 +- lib/html2text_readme.txt | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/html2text.php b/lib/html2text.php index f626f8d9164..36f22f24f75 100644 --- a/lib/html2text.php +++ b/lib/html2text.php @@ -468,7 +468,7 @@ class html2text // 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); + $text = preg_replace_callback($this->callback_search, array(&$this, '_preg_callback'), $text); // Replace known html entities $text = utf8_encode(html_entity_decode($text)); diff --git a/lib/html2text_readme.txt b/lib/html2text_readme.txt index a4079e68553..b59897f7221 100644 --- a/lib/html2text_readme.txt +++ b/lib/html2text_readme.txt @@ -21,4 +21,19 @@ instead of: (see http://nz.php.net/manual/en/function.html-entity-decode.php#89483) +2- fixed error in preg_replace_callback on php4 + +--- a/lib/html2text.php ++++ b/lib/html2text.php +@@ -468,7 +468,7 @@ class html2text + + // 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); ++ $text = preg_replace_callback($this->callback_search, array(&$this, '_preg_callback'), $text); + + // Replace known html entities + $text = utf8_encode(html_entity_decode($text)); + + -- Francois Marier 2009-05-22