Merge branch 'master' of github.com:freescout-helpdesk/freescout into…

… dist
freescout-help-desk · Jun 5, 2023 · b6b1292 · b6b1292
2 parents d3aa94a + 2d4e4e7
commit b6b1292
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/Http/Middleware/HttpsRedirect.php b/app/Http/Middleware/HttpsRedirect.php
@@ -41,7 +41,7 @@ public function handle($request, Closure $next)
 
         // Correct protocol in $_SERVER
         if (\Helper::isHttps() 
-            && !$request->secure() 
+            //&& !$request->secure() 
             && strtolower($_SERVER['HTTPS'] ?? '') != 'on'
         ) {
             $_SERVER['HTTPS'] = 'on';

diff --git a/config/app.php b/config/app.php
@@ -18,7 +18,7 @@
     | or any other location as required by the application or its packages.
     */
 
-    'version' => '1.8.79',
+    'version' => '1.8.80',
 
     /*
     |--------------------------------------------------------------------------