3 files changed, 32 insertions, 37 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 8122b87e4b..dd9201165b 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -1415,6 +1415,38 @@ function phpbb_add_quickmod_option($option, $lang_string)
 }
 
 /**
+* Concatenate an array into a string list.
+*
+* @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"
+*/
+function phpbb_generate_string_list($items, $user)
+{
+	if (empty($items))
+	{
+		return '';
+	}
+
+	$count = sizeof($items);
+	$last_item = array_pop($items);
+	$lang_key = 'STRING_LIST_MULTI';
+
+	if ($count == 1)
+	{
+		return $last_item;
+	}
+	else if ($count == 2)
+	{
+		$lang_key = 'STRING_LIST_SIMPLE';
+	}
+	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
+
+	return $user->lang($lang_key, $list, $last_item);
+}
+
+/**
 * @package phpBB3
 */
 class bitfield
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index d760f09dcd..cd2c9e5ae6 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1499,35 +1499,3 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
 
 	return $links;
 }
-
-/**
-* Concatenate an array into a string list.
-*
-* @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"
-*/
-function phpbb_generate_string_list($items, $user)
-{
-	if (empty($items))
-	{
-		return '';
-	}
-
-	$count = sizeof($items);
-	$last_item = array_pop($items);
-	$lang_key = 'STRING_LIST_MULTI';
-
-	if ($count == 1)
-	{
-		return $last_item;
-	}
-	else if ($count == 2)
-	{
-		$lang_key = 'STRING_LIST_SIMPLE';
-	}
-	$list = implode($user->lang['COMMA_SEPARATOR'], $items);
-
-	return $user->lang($lang_key, $list, $last_item);
-}
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index d3491a3f5e..140c0ad82a 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -211,11 +211,6 @@ class post extends \phpbb\notification\type\base
 			$usernames[] = $this->user->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt);
 		}
 
-		if (!function_exists('phpbb_generate_string_list'))
-		{
-			include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
-		}
-
 		return $this->user->lang(
 			$this->language_key,
 			phpbb_generate_string_list($usernames, $this->user),