aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorFyorl <gaelreth@gmail.com>2012-08-04 13:58:50 +0100
committerFyorl <gaelreth@gmail.com>2012-08-04 13:58:50 +0100
commit18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1 (patch)
tree29221ba3f61b0a6a874ab57b9de59b4cdd2477b6 /phpBB
parentbbdbff1ab39ddffc0c1adcc9cf1f16093cc891e9 (diff)
downloadforums-18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1.tar
forums-18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1.tar.gz
forums-18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1.tar.bz2
forums-18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1.tar.xz
forums-18d7210a11b4d98c50ad55bb427c8cd2cc14a2f1.zip
[feature/attach-dl] Prefixed gen_download_links with phpbb_
PHPBB3-11042
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions_display.php2
-rw-r--r--phpBB/viewtopic.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index a99d2353ed..6164885732 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1296,7 +1296,7 @@ function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $
*
* @return array Array containing the link and the type of compression
*/
-function gen_download_links($param_key, $param_val, $phpbb_root_path, $phpEx)
+function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $phpEx)
{
$methods = compress::methods();
$links = array();
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 1199fc4d14..a4d7c8baa1 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1319,7 +1319,7 @@ $template->assign_vars(array(
'S_HAS_ATTACHMENTS' => !empty($attachments),
));
-$methods = gen_download_links('topic_id', $topic_id, $phpbb_root_path, $phpEx);
+$methods = phpbb_gen_download_links('topic_id', $topic_id, $phpbb_root_path, $phpEx);
foreach ($methods as $method)
{
$template->assign_block_vars('dl_method', $method);
@@ -1607,7 +1607,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
);
}
- $methods = gen_download_links('post_id', $row['post_id'], $phpbb_root_path, $phpEx);
+ $methods = phpbb_gen_download_links('post_id', $row['post_id'], $phpbb_root_path, $phpEx);
foreach ($methods as $method)
{
$template->assign_block_vars('postrow.dl_method', $method);