archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-05 08:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Updated translator attribution and StyleCI changes

Browse source
This commit is contained in:
Dan Brown 2022-01-24 20:55:03 +00:00
parent f18e2784be
commit 585bd0cc45
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
3 changed files with 7 additions and 2 deletions
.github
translators.txt
app
Entities/Tools
PdfGenerator.php
Http/Controllers
UserController.php

4
.github/translators.txt vendored
View file

@ -211,3 +211,7 @@ Mundo Racional (ismael.mesquita) :: Portuguese, Brazilian
Zarik (3apuk) :: Russian Zarik (3apuk) :: Russian
Ali Shaatani (a.shaatani) :: Arabic Ali Shaatani (a.shaatani) :: Arabic
ChacMaster :: Portuguese, Brazilian ChacMaster :: Portuguese, Brazilian
Saeed (saeed205) :: Persian
Julesdevops :: French
peter cerny (posli.to.semka) :: Slovak
Pavel Karlin (pavelkarlin) :: Russian

1
app/Entities/Tools/PdfGenerator.php
View file

@ -32,6 +32,7 @@ class PdfGenerator
public function getActiveEngine(): string public function getActiveEngine(): string
{ {
$useWKHTML = config('snappy.pdf.binary') !== false && config('app.allow_untrusted_server_fetching') === true; $useWKHTML = config('snappy.pdf.binary') !== false && config('app.allow_untrusted_server_fetching') === true;
return $useWKHTML ? self::ENGINE_WKHTML : self::ENGINE_DOMPDF; return $useWKHTML ? self::ENGINE_WKHTML : self::ENGINE_DOMPDF;
} }
} }

4
app/Http/Controllers/UserController.php
View file

@ -112,9 +112,9 @@ class UserController extends Controller
$roles = $request->get('roles'); $roles = $request->get('roles');
$this->userRepo->setUserRoles($user, $roles); $this->userRepo->setUserRoles($user, $roles);
} }
$this->userRepo->downloadAndAssignUserAvatar($user); $this->userRepo->downloadAndAssignUserAvatar($user);
$this->logActivity(ActivityType::USER_CREATE, $user); $this->logActivity(ActivityType::USER_CREATE, $user);
}); });