diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-09-08 00:49:13 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-09-08 00:49:13 +0200 |
| commit | 23b00d393cd39336befb81c4f422f4e04aefdbf4 (patch) | |
| tree | 6bd186312c8ff86b1512a6f06475313763859e28 /phpBB | |
| parent | 7bf598954c452448c2807428f6517cd75d910f92 (diff) | |
| parent | c93b3827dc0644ea4aece1af661224aaa68a4cae (diff) | |
| download | forums-23b00d393cd39336befb81c4f422f4e04aefdbf4.tar forums-23b00d393cd39336befb81c4f422f4e04aefdbf4.tar.gz forums-23b00d393cd39336befb81c4f422f4e04aefdbf4.tar.bz2 forums-23b00d393cd39336befb81c4f422f4e04aefdbf4.tar.xz forums-23b00d393cd39336befb81c4f422f4e04aefdbf4.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11092' into develop
* EXreaction/ticket/11092:
[ticket/11092] phpbb_gen_download_links strict standards errors
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_compress.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
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; |