1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-27 16:36:00 +00:00

Merge pull request #7967 from wallabag/fix-some-deprecation-notices

Fix some deprecation notices
This commit is contained in:
Kevin Decherf 2025-01-19 15:46:45 +01:00 committed by GitHub
commit 7f340f83d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
56 changed files with 88 additions and 80 deletions

View file

@ -625,6 +625,7 @@ class EntryController extends AbstractController
{
$searchTerm = (isset($request->query->get('search_entry')['term']) ? trim($request->query->get('search_entry')['term']) : '');
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
$currentEntryId = $request->attributes->getInt('id');
$formOptions = [];
@ -651,7 +652,7 @@ class EntryController extends AbstractController
$formOptions['filter_unread'] = true;
break;
case 'same-domain':
$qb = $this->entryRepository->getBuilderForSameDomainByUser($this->getUser()->getId(), $request->get('id'));
$qb = $this->entryRepository->getBuilderForSameDomainByUser($this->getUser()->getId(), $currentEntryId);
break;
case 'all':
$qb = $this->entryRepository->getBuilderForAllByUser($this->getUser()->getId());
@ -664,7 +665,7 @@ class EntryController extends AbstractController
if ($request->query->has($form->getName())) {
// manually bind values from the request
$form->submit($request->query->get($form->getName()));
$form->submit($request->query->all($form->getName()));
// build the query from the given form object
$this->filterBuilderUpdater->addFilterConditions($form, $qb);