gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #17040 - Fix gis vis pos and limit

Browse Source 
Pull-request: #17040

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2021-07-28 01:29:44 +02:00
commit feb82643d0
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/classes/Controllers/Table/GisVisualizationController.php
View File

@ -107,15 +107,16 @@ final class GisVisualizationController extends AbstractController
$visualizationSettings['spatialColumn'] = $spatialCandidates[0]; $visualizationSettings['spatialColumn'] = $spatialCandidates[0];
} }
// Download as PNG/SVG/PDF use _GET and the normal form uses _POST
// Convert geometric columns from bytes to text. // Convert geometric columns from bytes to text.
$pos = $_GET['pos'] ?? $_SESSION['tmpval']['pos']; $pos = (int) ($_POST['pos'] ?? $_GET['pos'] ?? $_SESSION['tmpval']['pos']);
if (isset($_GET['session_max_rows'])) { if (isset($_POST['session_max_rows']) || isset($_GET['session_max_rows'])) {
$rows = $_GET['session_max_rows']; $rows = (int) ($_POST['session_max_rows'] ?? $_GET['session_max_rows']);
} else { } else {
if ($_SESSION['tmpval']['max_rows'] !== 'all') { if ($_SESSION['tmpval']['max_rows'] !== 'all') {
$rows = $_SESSION['tmpval']['max_rows']; $rows = (int) $_SESSION['tmpval']['max_rows'];
} else { } else {
$rows = $GLOBALS['cfg']['MaxRows']; $rows = (int) $GLOBALS['cfg']['MaxRows'];
} }
} }
$this->visualization = GisVisualization::get( $this->visualization = GisVisualization::get(