makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11959] Move phpbb_generate_string_list() to functions_content.php.

Browse source 
PHPBB3-11959
This commit is contained in:
Cesar G 2014-03-29 09:29:47 -07:00
parent 2a822931c6
commit b893dae105
4 changed files with 33 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
phpBB/includes/functions_content.php
View file

@ -1414,6 +1414,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 * @package phpBB3
*/ */

32
phpBB/includes/functions_display.php
View file

@ -1499,35 +1499,3 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
return $links; 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);
}

5
phpBB/phpbb/notification/type/post.php
View file

@ -211,11 +211,6 @@ class post extends \phpbb\notification\type\base
$usernames[] = $this->user->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt); $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( return $this->user->lang(
$this->language_key, $this->language_key,
phpbb_generate_string_list($usernames, $this->user), phpbb_generate_string_list($usernames, $this->user),

2
tests/functions/generate_string_list.php
View file

@ -7,7 +7,7 @@
* *
*/ */
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_display.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
class phpbb_generate_string_list_test extends phpbb_test_case class phpbb_generate_string_list_test extends phpbb_test_case