aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-09-06 18:27:49 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-09-07 11:29:47 -0500
commitc93b3827dc0644ea4aece1af661224aaa68a4cae (patch)
tree6bd186312c8ff86b1512a6f06475313763859e28
parent81f7f28cc33d896973c2912097103ea84fa14114 (diff)
downloadforums-c93b3827dc0644ea4aece1af661224aaa68a4cae.tar
forums-c93b3827dc0644ea4aece1af661224aaa68a4cae.tar.gz
forums-c93b3827dc0644ea4aece1af661224aaa68a4cae.tar.bz2
forums-c93b3827dc0644ea4aece1af661224aaa68a4cae.tar.xz
forums-c93b3827dc0644ea4aece1af661224aaa68a4cae.zip
[ticket/11092] phpbb_gen_download_links strict standards errors
Two strict standards errors in phpbb_gen_download_links PHPBB3-11092
-rw-r--r--phpBB/includes/functions_compress.php4
-rw-r--r--phpBB/includes/functions_display.php3
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php
index 8e07e6d1b8..4675394633 100644
--- a/phpBB/includes/functions_compress.php
+++ b/phpBB/includes/functions_compress.php
@@ -159,8 +159,10 @@ class compress
/**
* Return available methods
+ *
+ * @return array Array of strings of available compression methods (.tar, .tar.gz, .zip, etc.)
*/
- function methods()
+ public static function methods()
{
$methods = array('.tar');
$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 881c95907b..8328b9ee7a 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1410,7 +1410,8 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
foreach ($methods as $method)
{
- $type = array_pop(explode('.', $method));
+ $exploded = explode('.', $method);
+ $type = array_pop($exploded);
$params = array('archive' => $method);
$params[$param_key] = $param_val;