Skip to content

[3.0] Stop logging an error for every personal message search #9465

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

Open
albertlast wants to merge 1 commit into
base: release-3.0
Choose a base branch
from
Open

[3.0] Stop logging an error for every personal message search #9465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 3 deletions Sources/PersonalMessage/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,11 @@ public function performSearch(): void
// Load the users...
User::load(Utils::$context['posters']);

// Sort out the page index.
$start = (int) ($_GET['start'] ?? 0);
// Sort out the page index. PageIndex takes this by reference and clamps
// it, so hand it a copy of what was asked for and keep the original to
// compare against. Reading $_GET again here instead is what left the
// line below unguarded, since a search arrives without a start.
$start = $this->start;
Utils::$context['page_index'] = new PageIndex(
Config::$scripturl . '?action=pm;sa=search2;params=' . $this->compressed_params,
$start,
Expand All @@ -329,7 +332,7 @@ public function performSearch(): void
);

// If the supplied start value was invalid, redirect to the correct one.
if ($_GET['start'] != $start) {
if ($this->start != $start) {
Utils::redirectexit(Utils::$context['page_index']->base_url . ';start=' . $start);
}

Expand Down