This commit is contained in:
James Cole 2020-04-22 09:28:20 +02:00
parent b5eafa1910
commit 8fed6b6657
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
3 changed files with 1 additions and 5 deletions

View File

@ -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',

View File

@ -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),
];

View File

@ -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;">