Permalink
Browse files

MDL-29462 html_to_text('0') gives '', not '0'.

  • Loading branch information...
1 parent 136fa79 commit 4e92a71fb35240c05cf7cbd3c0fd246040bdf47f @timhunt timhunt committed Sep 21, 2011
Showing with 20 additions and 1 deletion.
  1. +1 −1 lib/html2text.php
  2. +15 −0 lib/html2text_readme.txt
  3. +4 −0 lib/simpletest/testweblib.php
View
@@ -335,7 +335,7 @@ class html2text
*/
function html2text( $source = '', $from_file = false, $do_links = true, $width = 75 )
{
- if ( !empty($source) ) {
+ if ($source !== '') {
$this->set_html($source, $from_file);
}
View
@@ -53,3 +53,18 @@ Index: lib/html2text.php
}
-- Tim Hunt 2010-11-02
+
+4 - Make sure html2text does not destroy '0'.
+
+index e2d0dff..9cc213d 100644
+--- a/lib/html2text.php
++++ b/lib/html2text.php
+@@ -335,7 +335,7 @@ class html2text
+ */
+ function html2text( $source = '', $from_file = false, $do_links = true, $wi {
+- if ( !empty($source) ) {
++ if ($source !== '') {
+ $this->set_html($source, $from_file);
+ }
+
+-- Tim Hunt 2011-09-21
@@ -140,6 +140,10 @@ public function test_html_to_text_trailing_whitespace() {
$this->assertEqual('With trailing whitespace and some more text', html_to_text("With trailing whitespace \nand some more text", 0));
}
+ public function test_html_to_text_0() {
+ $this->assertIdentical('0', html_to_text('0'));
+ }
+
public function test_clean_text() {
$text = "lala <applet>xx</applet>";
$this->assertEqual($text, clean_text($text, FORMAT_PLAIN));

0 comments on commit 4e92a71

Please sign in to comment.