7 files changed, 184 insertions, 2 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index 265fe1bb25..10ca6c0a1f 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -1956,6 +1956,7 @@ class phpbb_db_tools
 					$statements[] = "DROP SEQUENCE {$row['referenced_name']}";
 				}
 				$this->db->sql_freeresult($result);
+			break;
 
 			case 'postgres':
 				// PGSQL does not "tightly" bind sequences and tables, we must guess...
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index df49bdf637..628f8ee123 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2225,6 +2225,12 @@ function append_sid($url, $params = false, $is_amp = true, $session_id = false)
 {
 	global $_SID, $_EXTRA_URL, $phpbb_hook;
 
+	if ($params === '' || (is_array($params) && empty($params)))
+	{
+		// Do not append the ? if the param-list is empty anyway.
+		$params = false;
+	}
+
 	// Developers using the hook function need to globalise the $_SID and $_EXTRA_URL on their own and also handle it appropriately.
 	// They could mimic most of what is within this function
 	if (!empty($phpbb_hook) && $phpbb_hook->call_hook(__FUNCTION__, $url, $params, $is_amp, $session_id))
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index 11e525ff79..020574b0bb 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -41,6 +41,28 @@ class phpbb_mock_cache
 	{
 		return $this->data['_bots'];
 	}
+	
+	/**
+	 * Obtain list of word censors. We don't need to parse them here,
+	 * that is tested elsewhere.
+	 */
+	public function obtain_word_list()
+	{
+		return array(
+			'match'		=> array(
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword1[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])([\\p{Nd}\\p{L}_-]*?badword2)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword3[\\p{Nd}\\p{L}_-]*?)(?![\\p{Nd}\\p{L}_-])#iu',
+				'#(?<![\\p{Nd}\\p{L}_-])(badword4)(?![\\p{Nd}\\p{L}_-])#iu',
+			),
+			'replace'	=> array(
+				'replacement1',
+				'replacement2',
+				'replacement3',
+				'replacement4',
+			),
+		);
+	}
 
 	public function set_bots($bots)
 	{
diff --git a/tests/mock_user.php b/tests/mock_user.php
index 74d31c4c4a..5b89ea3e19 100644
--- a/tests/mock_user.php
+++ b/tests/mock_user.php
@@ -17,4 +17,20 @@ class phpbb_mock_user
 {
 	public $host = "testhost";
 	public $page = array('root_script_path' => '/');
+	
+	private $options = array();
+	public function optionget($item)
+	{
+		if (!isset($this->options[$item]))
+		{
+			throw new Exception(sprintf("You didn't set the option '%s' on the mock user using optionset.", $item));
+		}
+		
+		return $this->options[$item];
+	}
+	
+	public function optionset($item, $value)
+	{
+		$this->options[$item] = $value;
+	}
 }
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
new file mode 100644
index 0000000000..1a3ad633e3
--- /dev/null
+++ b/tests/session/append_sid_test.php
@@ -0,0 +1,51 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+
+class phpbb_session_append_sid_test extends phpbb_test_case
+{
+
+	public function append_sid_data()
+	{
+		return array(
+			array('viewtopic.php?t=1&amp;f=2', false, true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2', true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument using amp'),
+			array('viewtopic.php', 't=1&f=2', false, false, 'viewtopic.php?t=1&f=2', 'parameters in params-argument using &'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2), true, false, 'viewtopic.php?t=1&amp;f=2', 'parameters in params-argument as array'),
+
+			// Custom sid parameter
+			array('viewtopic.php', 't=1&amp;f=2', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid', 'using session_id'),
+
+			// Testing anchors
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in url-argument'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'viewtopic.php?t=1&amp;f=2#anchor', 'anchor in params-argument (array)'),
+
+			// Anchors and custom sid
+			array('viewtopic.php?t=1&amp;f=2#anchor', false, true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in url-argument using session_id'),
+			array('viewtopic.php', 't=1&amp;f=2#anchor', true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument using session_id'),
+			array('viewtopic.php', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'viewtopic.php?t=1&amp;f=2&amp;sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'),
+
+			// Empty parameters should not append the ?
+			array('viewtopic.php', false, true, false, 'viewtopic.php', 'no params using bool false'),
+			array('viewtopic.php', '', true, false, 'viewtopic.php', 'no params using empty string'),
+			array('viewtopic.php', array(), true, false, 'viewtopic.php', 'no params using empty array'),
+		);
+	}
+
+	/**
+	* @dataProvider append_sid_data
+	*/
+	public function test_append_sid($url, $params, $is_amp, $session_id, $expected, $description)
+	{
+		$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
+	}
+}
+
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 33c82d53ad..5005710220 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -63,9 +63,10 @@ class phpbb_template_template_test extends phpbb_test_case
 		// Test the engine can be used
 		$this->setup_engine();
 
-		if (!is_writable(dirname($this->template->cachepath)))
+		$template_cache_dir = dirname($this->template->cachepath);
+		if (!is_writable($template_cache_dir))
 		{
-			$this->markTestSkipped("Template cache directory is not writable.");
+			$this->markTestSkipped("Template cache directory ({$template_cache_dir}) is not writable.");
 		}
 
 		foreach (glob($this->template->cachepath . '*') as $file)
diff --git a/tests/text_processing/censor_text_test.php b/tests/text_processing/censor_text_test.php
new file mode 100644
index 0000000000..2843f0b20b
--- /dev/null
+++ b/tests/text_processing/censor_text_test.php
@@ -0,0 +1,85 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2011 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License
+*
+*/
+
+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_censor_text_test extends phpbb_test_case
+{
+	public function censor_text_data()
+	{
+		global $cache, $user;
+		$cache = new phpbb_mock_cache;
+		$user = new phpbb_mock_user;
+		
+		$user->optionset('viewcensors', false);
+
+		return array(
+			array('', ''),
+
+			array('badword1', 'replacement1'),
+			array(' badword1', ' replacement1'),
+			array('badword1 ', 'replacement1 '),
+			array(' badword1 ', ' replacement1 '),
+			array('abadword1', 'replacement1'),
+			array('badword1w', 'replacement1'),
+			array('abadword1w', 'replacement1'),
+			array('anotherbadword1test', 'replacement1'),
+			array('this badword1', 'this replacement1'),
+			array('this badword1 word', 'this replacement1 word'),
+
+			array('badword2', 'replacement2'),
+			array('bbadword2', 'replacement2'),
+			array('bbbadword2', 'replacement2'),
+			array('badword2d', 'badword2d'),
+			array('bbadword2d', 'bbadword2d'),
+			array('test badword2', 'test replacement2'),
+			array('test badword2 word', 'test replacement2 word'),
+
+			array('badword3', 'replacement3'),
+			array('bbadword3', 'bbadword3'),
+			array('badword3d', 'replacement3'),
+			array('badword3ddd', 'replacement3'),
+			array('bbadword3d', 'bbadword3d'),
+			array(' badword3 ', ' replacement3 '),
+			array(' badword3', ' replacement3'),
+
+			array('badword4', 'replacement4'),
+			array('this badword4 word', 'this replacement4 word'),
+			array('abadword4', 'abadword4'),
+			array('badword4d', 'badword4d'),
+			array('abadword4d', 'abadword4d'),
+
+			array('badword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+			array('badword1 badword2 badword3 badword4d', 'replacement1 replacement2 replacement3 badword4d'),
+			array('abadword1 badword2 badword3 badword4', 'replacement1 replacement2 replacement3 replacement4'),
+			
+			array("new\nline\ntest", "new\nline\ntest"),
+			array("tab\ttest\t", "tab\ttest\t"),
+			array('öäü', 'öäü'),
+			array('badw' . chr(1) . 'ord1', 'badw' . chr(1) . 'ord1'),
+			array('badw' . chr(2) . 'ord1', 'badw' . chr(2) . 'ord1'),
+			array('badw' . chr(3) . 'ord1', 'badw' . chr(3) . 'ord1'),
+			array('badw' . chr(4) . 'ord1', 'badw' . chr(4) . 'ord1'),
+			array('badw' . chr(5) . 'ord1', 'badw' . chr(5) . 'ord1'),
+			array('badw' . chr(6) . 'ord1', 'badw' . chr(6) . 'ord1'),
+		);
+	}
+
+	/**
+	* @dataProvider censor_text_data
+	*/
+	public function test_censor_text($input, $expected)
+	{
+		$label = 'Testing word censor: ' . $input;
+		$this->assertEquals($expected, censor_text($input), $label);
+	}
+}