diff --git a/ChangeLog b/ChangeLog index 31758180..bedf0aac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ -Version 4.6.2 20220124_2100 +Version 4.6.2 20220127_1030 + - Fix zipfile name on upgrade process to properly handle releases download from github - Support for AccessControlList on competition modules - Add support for RSCE Seaseon 2022 - Fixes from 4.6.1 (default hidden value for Grado I "/Agility/Jumping/Oder", error on group categories on print ) diff --git a/agility/upgrade.php b/agility/upgrade.php index e13cc611..079dc730 100644 --- a/agility/upgrade.php +++ b/agility/upgrade.php @@ -242,8 +242,12 @@ public function doUpgrade() { if (! is_resource($zip) ) { $this->logProgress("ERROR: zipfile failed errno: $zip"); return false; } while ($aF = zip_read($zip) ) { set_time_limit(ini_get('max_execution_time')); - // get file name and their directory - $file_name = str_replace("AgilityContest-master/","",zip_entry_name($aF)); + // get file name and their directory old style + $ext="master"; + $file_name = str_replace("AgilityContest-{$ext}/","",zip_entry_name($aF)); + // get file name and their directory new style (from github releases) + $ext=$this->getVersionName()."-".$this->getVersionDate(); + $file_name = str_replace("AgilityContest-{$ext}/","",zip_entry_name($aF)); $file_size = zip_entry_filesize($aF); $dir_name = dirname($file_name); // skip directories in zip file diff --git a/config/system.ini b/config/system.ini index 97f0242e..f0a89bff 100644 --- a/config/system.ini +++ b/config/system.ini @@ -4,7 +4,7 @@ author = "Juan Antonio Martinez" email = "juansgaviota@gmail.com" license = "GPL" version_name = "4.6.2" -version_date = "20220124_2100" +version_date = "20220127_1030" database_name = "agility" database_host = "localhost" database_user = "YWdpbGl0eV9vcGVyYXRvcg=="