Merge remote-tracking branch 'EXreaction/ticket/11092' into develop

* EXreaction/ticket/11092:
  [ticket/11092] phpbb_gen_download_links strict standards errors
This commit is contained in:
Andreas Fischer 2012-09-08 00:49:13 +02:00
commit 23b00d393c
2 changed files with 5 additions and 2 deletions

View file

@ -159,8 +159,10 @@ class compress
/** /**
* Return available methods * 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'); $methods = array('.tar');
$available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib'); $available_methods = array('.tar.gz' => 'zlib', '.tar.bz2' => 'bz2', '.zip' => 'zlib');

View file

@ -1410,7 +1410,8 @@ function phpbb_gen_download_links($param_key, $param_val, $phpbb_root_path, $php
foreach ($methods as $method) foreach ($methods as $method)
{ {
$type = array_pop(explode('.', $method)); $exploded = explode('.', $method);
$type = array_pop($exploded);
$params = array('archive' => $method); $params = array('archive' => $method);
$params[$param_key] = $param_val; $params[$param_key] = $param_val;