Skip to content

[pull] development from BookStackApp:development #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Dec 19, 2025
Merged

[pull] development from BookStackApp:development #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2de3247
Deps: Updated PHP package versions
ssddanbrown Dec 19, 2025
0b48361
Search: Fixed pagination not considering sub-paths
ssddanbrown Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions app/Access/Mfa/TotpService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@

class TotpService
{
protected $google2fa;

public function __construct(Google2FA $google2fa)
{
public function __construct(
protected Google2FA $google2fa
) {
$this->google2fa = $google2fa;
// Use SHA1 as a default, Personal testing of other options in 2021 found
// many apps lack support for other algorithms yet still will scan
Expand All @@ -35,7 +34,7 @@ public function generateSecret(): string
}

/**
* Generate a TOTP URL from secret key.
* Generate a TOTP URL from a secret key.
*/
public function generateUrl(string $secret, User $user): string
{
Expand Down
2 changes: 1 addition & 1 deletion app/Search/SearchController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function search(Request $request, SearchResultsFormatter $formatter)
$results = $this->searchRunner->searchEntities($searchOpts, 'all', $page, $count);
$formatter->format($results['results']->all(), $searchOpts);
$paginator = new LengthAwarePaginator($results['results'], $results['total'], $count, $page);
$paginator->setPath('/search');
$paginator->setPath(url('/search'));
$paginator->appends($request->except('page'));

$this->setPageTitle(trans('entities.search_for_term', ['term' => $fullSearchString]));
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"league/oauth2-client": "^2.6",
"onelogin/php-saml": "^4.3.1",
"phpseclib/phpseclib": "^3.0",
"pragmarx/google2fa": "^8.0",
"pragmarx/google2fa": "^9.0",
"predis/predis": "^3.2",
"socialiteproviders/discord": "^4.1",
"socialiteproviders/gitlab": "^4.1",
Expand All @@ -47,7 +47,7 @@
"nunomaduro/collision": "^8.6",
"larastan/larastan": "^v3.0",
"phpunit/phpunit": "^11.5",
"squizlabs/php_codesniffer": "^3.7",
"squizlabs/php_codesniffer": "^4.0.1",
"ssddanbrown/asserthtml": "^3.1"
},
"autoload": {
Expand Down
Loading