[Scummvm-git-logs] scummvm-web master -> 68e0ca2d7bfd0dc278e1120138df2e4f6f108b65

[Mataniko]

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

Summary:
a249c3207b CSS: Fix overflow on the download button
68e0ca2d7b WEB: Escape user agent in DownloadsModel preg_match


Commit: a249c3207b6e346476a52d4f606f3cee4449dfd8
    https://github.com/scummvm/scummvm-web/commit/a249c3207b6e346476a52d4f606f3cee4449dfd8
Author: mataniko (mataniko at gmail.com)
Date: 2020-01-31T16:59:06-05:00

Commit Message:
CSS: Fix overflow on the download button

Changed paths:
    scss/pages/_downloads.scss


diff --git a/scss/pages/_downloads.scss b/scss/pages/_downloads.scss
index 4ef0c9c..ba9bd60 100644
--- a/scss/pages/_downloads.scss
+++ b/scss/pages/_downloads.scss
@@ -31,7 +31,6 @@ span.daily_provider {
 	#downloadButton {
 		min-height: 53px;
 		float: left;
-		margin-bottom: 30px;
 		width: 100%;
 		padding: 15px;
 		color: $theme-download-text;


Commit: 68e0ca2d7bfd0dc278e1120138df2e4f6f108b65
    https://github.com/scummvm/scummvm-web/commit/68e0ca2d7bfd0dc278e1120138df2e4f6f108b65
Author: mataniko (mataniko at gmail.com)
Date: 2020-01-31T17:37:10-05:00

Commit Message:
WEB: Escape user agent in DownloadsModel preg_match

Changed paths:
    include/Models/DownloadsModel.php


diff --git a/include/Models/DownloadsModel.php b/include/Models/DownloadsModel.php
index 9b5277c..c54a7ae 100644
--- a/include/Models/DownloadsModel.php
+++ b/include/Models/DownloadsModel.php
@@ -77,7 +77,8 @@ abstract class DownloadsModel
                     array_filter(
                         $dsubsection->getItems(), function ($item) use ($os) {
                             if ($item->getUserAgent() != "") {
-                                return preg_match("/({$item->getUserAgent()})/i", $os['name']);
+                                $ua = preg_quote($item->getUserAgent(), '/');
+                                return preg_match("/({$ua})/i", $os['name']);
                             }
                         }
                     )