4 files changed, 86 insertions, 3 deletions
diff --git a/tests/functions_content/phpbb_clean_search_string_test.php b/tests/functions_content/phpbb_clean_search_string_test.php
new file mode 100644
index 0000000000..de642c9040
--- /dev/null
+++ b/tests/functions_content/phpbb_clean_search_string_test.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
+
+class phpbb_functions_content_phpbb_clean_search_string_test extends phpbb_test_case
+{
+	public function phpbb_clean_search_string_data()
+	{
+		return array(
+			array('*', ''),
+			array('* *', ''),
+			array('test', 'test'),
+			array(' test ', 'test'),
+			array(' test * ', 'test'),
+			array('test* *', 'test*'),
+			array('* *test*', '*test*'),
+			array('test  test  * test', 'test test test'),
+			array(' some  wild*cards *    between wo*rds  ', 'some wild*cards between wo*rds'),
+			array(' we * now have*** multiple wild***cards * ', 'we now have* multiple wild*cards'),
+			array('pi is *** . * **** * *****', 'pi is .'),
+		);
+	}
+
+	/**
+	* @dataProvider phpbb_clean_search_string_data
+	*/
+	public function test_phpbb_clean_search_string($search_string, $expected)
+	{
+		$this->assertEquals($expected, phpbb_clean_search_string($search_string));
+	}
+}
diff --git a/tests/log/fixtures/full_log.xml b/tests/log/fixtures/full_log.xml
index a10c224e0e..4e5538d5a9 100644
--- a/tests/log/fixtures/full_log.xml
+++ b/tests/log/fixtures/full_log.xml
@@ -119,6 +119,18 @@
 			<value>LOG_USER</value>
 			<value>a:1:{i:0;s:5:"guest";}</value>
 		</row>
+		<row>
+			<value>10</value>
+			<value>3</value>
+			<value>1</value>
+			<value>0</value>
+			<value>0</value>
+			<value>0</value>
+			<value>127.0.0.1</value>
+			<value>1</value>
+			<value>LOG_SINGULAR_PLURAL</value>
+			<value>a:1:{i:0;i:2;}</value>
+		</row>
 	</table>
 	<table name="phpbb_users">
 		<column>user_id</column>
diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php
index 2ddf7522f4..2f64459062 100644
--- a/tests/log/function_view_log_test.php
+++ b/tests/log/function_view_log_test.php
@@ -206,6 +206,25 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 				'viewforum'			=> '',
 				'action'			=> 'LOG_USER guest',
 			),
+			10 => array(
+				'id'				=> 10,
+
+				'reportee_id'			=> 0,
+				'reportee_username'		=> '',
+				'reportee_username_full'=> '',
+
+				'user_id'			=> 1,
+				'username'			=> 'Anonymous',
+				'username_full'		=> 'Anonymous',
+
+				'ip'				=> '127.0.0.1',
+				'time'				=> 1,
+				'forum_id'			=> 0,
+				'topic_id'			=> 0,
+
+				'viewforum'			=> '',
+				'action'			=> 'LOG_SINGULAR_PLURAL 2',
+			),
 		);
 
 		$test_cases = array(
@@ -277,10 +296,20 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 				'user', 0, 5, 0, 0, 0, 2,
 			),
 			array(
-				'expected'			=> array(8, 9),
+				'expected'			=> array(8, 9, 10),
 				'expected_returned'	=> 0,
 				'users', 0,
 			),
+			array(
+				'expected'			=> array(1),
+				'expected_returned'	=> 0,
+				'admin', false, 5, 0, 0, 0, 0, 0, 'l.log_id ASC', 'install',
+			),
+			array(
+				'expected'			=> array(10),
+				'expected_returned'	=> 0,
+				'user', false, 5, 0, 0, 0, 0, 0, 'l.log_id ASC', 'plural',
+			),
 		);
 
 		foreach ($test_cases as $case => $case_data)
@@ -333,6 +362,10 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case
 			'LOG_INSTALL_INSTALLED'		=> 'installed: %s',
 			'LOG_USER'					=> 'User<br /> %s',
 			'LOG_MOD2'					=> 'Mod2',
+			'LOG_SINGULAR_PLURAL'		=> array(
+				1	=> 'singular',
+				2	=> 'plural (%d)',
+			),
 		);
 
 		$phpbb_log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE);
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 1f372fff0c..95ed334ed0 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -522,8 +522,8 @@ class phpbb_functional_test_case extends phpbb_test_case
 			'user_email' => 'nobody@example.com',
 			'user_type' => 0,
 			'user_lang' => 'en',
-			'user_timezone' => 0,
-			'user_dateformat' => '',
+			'user_timezone' => 'UTC',
+			'user_dateformat' => 'r',
 			'user_password' => $passwords_manager->hash($username . $username),
 		);
 		return user_add($user_row);