diff --git a/psalm-baseline.xml b/psalm-baseline.xml index a07692b5a1..dd0302dc1d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -901,9 +901,6 @@ Config::getInstance() - - - $columnDefault $columnDefault @@ -932,7 +929,6 @@ - $columnDefault $columnDefault diff --git a/src/Controllers/Database/CentralColumnsController.php b/src/Controllers/Database/CentralColumnsController.php index d627d191fc..a71d86b4d2 100644 --- a/src/Controllers/Database/CentralColumnsController.php +++ b/src/Controllers/Database/CentralColumnsController.php @@ -35,7 +35,6 @@ class CentralColumnsController extends AbstractController public function __invoke(ServerRequest $request): void { $GLOBALS['message'] ??= null; - $GLOBALS['num_cols'] ??= null; if ($request->hasBodyParam('edit_save')) { $this->response->addHTML((string) $this->editSave([ @@ -135,13 +134,13 @@ class CentralColumnsController extends AbstractController $pos = (int) $request->getParsedBodyParam('pos'); } - $GLOBALS['num_cols'] = $this->centralColumns->getColumnsCount( + $numberOfColumns = $this->centralColumns->getColumnsCount( $GLOBALS['db'], $pos, Config::getInstance()->settings['MaxRows'], ); $GLOBALS['message'] = Message::success( - sprintf(__('Showing rows %1$s - %2$s.'), $pos + 1, $pos + $GLOBALS['num_cols']), + sprintf(__('Showing rows %1$s - %2$s.'), $pos + 1, $pos + $numberOfColumns), ); if (! isset($tmpMsg) || $tmpMsg === true) { return;