2 files changed, 17 insertions, 10 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 311f86296d..d760f09dcd 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1506,18 +1506,28 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
 * @param array $items Array of items to concatenate
 * @param object $user The phpBB $user object.
 *
-* @return string String list. Examples: "A"; "A and B"; "A, B and C"
+* @return string String list. Examples: "A"; "A and B"; "A, B, and C"
 */
 function phpbb_generate_string_list($items, $user)
 {
+	if (empty($items))
+	{
+		return '';
+	}
+
 	$count = sizeof($items);
-	$last_item = '';
+	$last_item = array_pop($items);
+	$lang_key = 'STRING_LIST_MULTI';
 
-	if ($count > 1)
+	if ($count == 1)
+	{
+		return $last_item;
+	}
+	else if ($count == 2)
 	{
-		$last_item = array_pop($items);
+		$lang_key = 'STRING_LIST_SIMPLE';
 	}
 	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
 
-	return $user->lang('STRING_LIST', $list, $last_item, $count);
+	return $user->lang($lang_key, $list, $last_item);
 }
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 757e421759..f073954817 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -683,11 +683,8 @@ $lang = array_merge($lang, array(
 	'START_WATCHING_TOPIC'		=> 'Subscribe topic',
 	'STOP_WATCHING_FORUM'		=> 'Unsubscribe forum',
 	'STOP_WATCHING_TOPIC'		=> 'Unsubscribe topic',
-	'STRING_LIST'				=> array(
-		1 => '%1$s',
-		2 => '%1$s and %2$s',
-		// At 3 or more, %1$s returns comma separated items. So output would be: X, Y and Z
-	),
+	'STRING_LIST_MULTI'			=> '%1$s, and %2$s',
+	'STRING_LIST_SIMPLE'		=> '%1$s and %2$s',
 	'SUBFORUM'					=> 'Subforum',
 	'SUBFORUMS'					=> 'Subforums',
 	'SUBJECT'					=> 'Subject',