Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
This commit is contained in:
commit
c690548596
@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
|
||||
- issue #11614 Undefined variable: db
|
||||
- issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
|
||||
- issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given
|
||||
- issue #11632 Exporting GIS visualization ignores start and row count
|
||||
|
||||
4.5.1.0 (2015-10-23)
|
||||
- issue Invalid argument supplied for foreach()
|
||||
|
||||
@ -191,8 +191,15 @@ class TableGisVisualizationController extends TableController
|
||||
*/
|
||||
$this->url_params['sql_query'] = $this->sql_query;
|
||||
$downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon(
|
||||
$this->url_params
|
||||
) . '&saveToFile=true';
|
||||
array_merge(
|
||||
$this->url_params,
|
||||
array(
|
||||
'saveToFile' => true,
|
||||
'session_max_rows' => $rows,
|
||||
'pos' => $pos
|
||||
)
|
||||
)
|
||||
);
|
||||
$svgSupport = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8)
|
||||
? false : true;
|
||||
$html = Template::get('table/gis_visualization/gis_visualization')->render(
|
||||
|
||||
Loading…
Reference in New Issue
Block a user