aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-03-14 19:19:39 -0700
committerCesar G <prototech91@gmail.com>2014-03-19 03:08:33 -0700
commit3da1f6d989357c9076ffde532cfbbd3d6375aa3c (patch)
tree072222bc7b1538cbfd60d706eb5d4fbf6d672b99
parent285ad0f6faac275c56576616ed6a880a7f88e94b (diff)
downloadforums-3da1f6d989357c9076ffde532cfbbd3d6375aa3c.tar
forums-3da1f6d989357c9076ffde532cfbbd3d6375aa3c.tar.gz
forums-3da1f6d989357c9076ffde532cfbbd3d6375aa3c.tar.bz2
forums-3da1f6d989357c9076ffde532cfbbd3d6375aa3c.tar.xz
forums-3da1f6d989357c9076ffde532cfbbd3d6375aa3c.zip
[ticket/11959] Rename phpbb_gen_string_list() & fix incorrect var name.
PHPBB3-11959
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/phpbb/notification/type/post.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 6bffaeaa44..311f86296d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1508,7 +1508,7 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
*
* @return string String list. Examples: "A"; "A and B"; "A, B and C"
*/
-function phpbb_gen_string_list($items, $user)
+function phpbb_generate_string_list($items, $user)
{
$count = sizeof($items);
$last_item = '';
diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php
index 62c8bd52cb..d3491a3f5e 100644
--- a/phpBB/phpbb/notification/type/post.php
+++ b/phpBB/phpbb/notification/type/post.php
@@ -211,14 +211,14 @@ class post extends \phpbb\notification\type\base
$usernames[] = $this->user->lang('NOTIFICATION_X_OTHERS', $trimmed_responders_cnt);
}
- if (!function_exists('phpbb_gen_string_list'))
+ if (!function_exists('phpbb_generate_string_list'))
{
- include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ex);
+ include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
}
return $this->user->lang(
$this->language_key,
- phpbb_gen_string_list($usernames, $this->user),
+ phpbb_generate_string_list($usernames, $this->user),
censor_text($this->get_data('topic_title')),
$responders_cnt
);