[Scummvm-git-logs] scummvm-web master -> 1444fd65b0535a3e5fd6482e8b8780f8d775069e

[lotharsm]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
1444fd65b0 DATA: Override Win32 and Mac recommended download version


Commit: 1444fd65b0535a3e5fd6482e8b8780f8d775069e
    https://github.com/scummvm/scummvm-web/commit/1444fd65b0535a3e5fd6482e8b8780f8d775069e
Author: Lothar Serra Mari (mail at serra.me)
Date: 2020-03-31T21:15:58+02:00

Commit Message:
DATA: Override Win32 and Mac recommended download version

Changed paths:
    include/Constants.php
    include/Models/DownloadsModel.php


diff --git a/include/Constants.php b/include/Constants.php
index 670bdbd9..911d1e1e 100644
--- a/include/Constants.php
+++ b/include/Constants.php
@@ -9,7 +9,7 @@ class Constants
         define('RELEASE', '2.1.1');
         define('RELEASE_TOOLS', '2.1.0');
         define('RELEASE_DEBIAN', '2.1.1');
-        define('RELEASE_SNAP_STORE', '2.1.1');
+        define('RELEASE_SNAP_STORE', '2.1.2');
         define('RELEASE_ANDROID_STORE', '2.0.0');
 
         /* Version when the percentages on the compat page were removed */
diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index a3a1e5d8..f4f924d5 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -116,6 +116,16 @@ abstract class DownloadsModel
                         $extra_text = '(snap install scummvm)';
                     }
 
+                    /*
+                    HACK: Hard-code the version for Mac and Win32 due to the 2.1.2
+                          interim release. Setting it to the Snap Store version since
+                          that's always up to date. REMOVE with the next major release!
+                    */
+
+                    if ($os['name'] === 'windows' || 'Mac') {
+                        $version = RELEASE_SNAP_STORE;
+                    }
+
                     return array(
                     'os' => $name,
                     'ver' => $version,