From 8fed6b6657ce4c2c7066243c86d7464cc4005e5c Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 22 Apr 2020 09:28:20 +0200
Subject: [PATCH] Fix #3287

---
 app/Http/Controllers/DebugController.php | 4 +---
 app/Support/Steam.php                    | 1 -
 resources/views/v1/debug.twig            | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php
index 30e158829f..f887a5b833 100644
--- a/app/Http/Controllers/DebugController.php
+++ b/app/Http/Controllers/DebugController.php
@@ -126,7 +126,6 @@ class DebugController extends Controller
         $phpOs          = str_replace($search, $replace, PHP_OS);
         $interface      = PHP_SAPI;
         $now            = Carbon::now()->format('Y-m-d H:i:s e');
-        $extensions     = implode(', ', get_loaded_extensions());
         $drivers        = implode(', ', DB::availableDrivers());
         $currentDriver  = DB::getDriverName();
         $userAgent      = $request->header('user-agent');
@@ -143,7 +142,7 @@ class DebugController extends Controller
         // set languages, see what happens:
         $original       = setlocale(LC_ALL, 0);
         $localeAttempts = [];
-        $parts          = explode(',', (string) trans('config.locale'));
+        $parts          = app('steam')->getLocaleArray(app('steam')->getLocale());
         foreach ($parts as $code) {
             $code                  = trim($code);
             $localeAttempts[$code] = var_export(setlocale(LC_ALL, $code), true);
@@ -178,7 +177,6 @@ class DebugController extends Controller
             'debug',
             compact(
                 'phpVersion',
-                'extensions',
                 'localeAttempts',
                 'appEnv',
                 'appDebug',
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index 8a7281bcf9..c1fcdeb2f1 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -617,7 +617,6 @@ class Steam
      */
     public function getLocaleArray(string $locale): array {
         return [
-            sprintf('%s', $locale),
             sprintf('%s.utf8', $locale),
             sprintf('%s.UTF-8', $locale),
         ];
diff --git a/resources/views/v1/debug.twig b/resources/views/v1/debug.twig
index 37742cb623..82062fb2d2 100644
--- a/resources/views/v1/debug.twig
+++ b/resources/views/v1/debug.twig
@@ -41,7 +41,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | Login provider | {{ loginProvider }}  |
 | Trusted proxies (.env) | {{ trustedProxies }} |
 | User agent | {{ userAgent }} |
-| Loaded extensions | {{ extensions }} |
 </textarea>
 
 <p style="font-family:Arial, Arial, Helvetica, sans-serif;font-size:12pt;width:600px;color:#a00;">