From ff31168b1166a612cd704bc24c8f77dbdc679241 Mon Sep 17 00:00:00 2001 From: filip Date: Tue, 13 Apr 2021 15:43:12 +0200 Subject: remove unneeded deprecated 'optional parameter before required' in php8 --- en/4/download_index.php | 4 ++-- en/5/download_index.php | 4 ++-- en/6/download_index.php | 4 ++-- en/7/download_index.php | 4 ++-- en/8/download_index.php | 4 ++-- en/downloads/prerelease/download_index.php | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/en/4/download_index.php b/en/4/download_index.php index 120d6fe77..8847a6956 100644 --- a/en/4/download_index.php +++ b/en/4/download_index.php @@ -8,14 +8,14 @@ $dictionary = read_translation_file($locale, array('4', 'common_footer')); require '../downloads/get/lib.php'; $rtl = is_locale_rtl($locale); -function get_mageia_image_file_name($variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; return implode('-', array('Mageia','4.1', $va, $medium)) . $ext; } -function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $unavailabletorrent = false) +function dl_link($variant, $arch, $medium, $torrent = false, $unavailabletorrent = false) { switch ($arch) { case "i586": diff --git a/en/5/download_index.php b/en/5/download_index.php index 507f8fc76..65f91af8c 100644 --- a/en/5/download_index.php +++ b/en/5/download_index.php @@ -21,7 +21,7 @@ function get_mageia($name, $version, $release) return implode('-', array($name, $re)); } -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; $re = empty($release) ? $va : $release . '-' . $va; @@ -29,7 +29,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null, return implode('-', array($name, $version, $re, $medium)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true) +function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true) { switch ($arch) { case "i586": diff --git a/en/6/download_index.php b/en/6/download_index.php index e7887353b..4917f1189 100644 --- a/en/6/download_index.php +++ b/en/6/download_index.php @@ -22,7 +22,7 @@ function get_mageia($name, $version, $release) return implode('-', array($name, $re)); } -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; $re = empty($release) ? $va : $release . '-' . $va; @@ -30,7 +30,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null, return implode('-', array($name, $version, $re, $medium)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true) +function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true) { switch ($arch) { case "i586": diff --git a/en/7/download_index.php b/en/7/download_index.php index 8ec6e7376..a77bbf01b 100644 --- a/en/7/download_index.php +++ b/en/7/download_index.php @@ -22,7 +22,7 @@ function get_mageia($name, $version, $release) return implode('-', array($name, $re)); } -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; $re = empty($release) ? $va : $release . '-' . $va; @@ -30,7 +30,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null, return implode('-', array($name, $version, $re)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true) +function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true) { switch ($arch) { case "i586": diff --git a/en/8/download_index.php b/en/8/download_index.php index 8fed808f0..b1580fa73 100644 --- a/en/8/download_index.php +++ b/en/8/download_index.php @@ -22,7 +22,7 @@ function get_mageia($name, $version, $release) return implode('-', array($name, $re)); } -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; $re = empty($release) ? $va : $release . '-' . $va; @@ -30,7 +30,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null, return implode('-', array($name, $version, $re)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true) +function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true) { switch ($arch) { case "i586": diff --git a/en/downloads/prerelease/download_index.php b/en/downloads/prerelease/download_index.php index 263e219f8..526fa558e 100644 --- a/en/downloads/prerelease/download_index.php +++ b/en/downloads/prerelease/download_index.php @@ -21,7 +21,7 @@ function get_mageia($name, $version, $release) return implode('-', array($name, $re)); } -function get_mageia_image_file_name($name, $version, $release, $variant = null, $arch, $medium, $ext) +function get_mageia_image_file_name($name, $version, $release, $variant, $arch, $medium, $ext) { $va = empty($variant) ? $arch : $variant . '-' . $arch; $re = empty($release) ? $va : $release . '-' . $va; @@ -29,7 +29,7 @@ function get_mageia_image_file_name($name, $version, $release, $variant = null, return implode('-', array($name, $version, $re, $medium)) . $ext; } -function dl_link($name, $version, $release, $variant = null, $arch = 'i586', $medium, $torrent = false, $torrentavailable = true) +function dl_link($name, $version, $release, $variant, $arch, $medium, $torrent = false, $torrentavailable = true) { switch ($arch) { case "i586": -- cgit v1.2.1