mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-29462' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2011-09-26 22:40:32 +02:00
commit c430009676
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/html2text.php
View File

@ -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);
}

15
lib/html2text_readme.txt
View File

@ -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

4
lib/simpletest/testweblib.php
View File

@ -140,6 +140,10 @@ class web_test extends UnitTestCase {
$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));