2 files changed, 40 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 7d8b4a3144..00b31212b2 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -577,6 +577,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		// Any output before the doc type means there was an error
 		$content = self::$client->getResponse()->getContent();
+		self::assertNotContains('[phpBB Debug]', $content);
 		self::assertStringStartsWith('<!DOCTYPE', trim($content), 'Output found before DOCTYPE specification.');
 	}
 
@@ -660,7 +661,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		$hidden_fields = array(
 			$crawler->filter('[type="hidden"]')->each(function ($node, $i) {
-				return array('name' => $node->getAttribute('name'), 'value' => $node->getAttribute('value'));
+				return array('name' => $node->attr('name'), 'value' => $node->attr('value'));
 			}),
 		);
 
diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php
new file mode 100644
index 0000000000..a157fe7d9a
--- /dev/null
+++ b/tests/text_processing/generate_text_for_display_test.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../mock/user.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+
+class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_case
+{
+	public function setUp()
+	{
+		global $cache, $user;
+
+		parent::setUp();
+
+		$cache = new phpbb_mock_cache;
+
+		$user = new phpbb_mock_user;
+		$user->optionset('viewcensors', false);
+	}
+
+	public function test_empty_string()
+	{
+		$this->assertSame('', generate_text_for_display('', '', '', 0));
+	}
+
+	public function test_zero_string()
+	{
+		$this->assertSame('0', generate_text_for_display('0', '', '', 0));
+	}
+}