From babfaf16883bceebae5aa31d4d2af897c6b75b3e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 3 Jun 2015 11:15:14 +0530
Subject: [PATCH] Move common parts of the url out

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/tbl_gis_visualization.lib.php             | 5 +++--
 templates/gis_visualization/gis_visualization.phtml | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php
index 38cff511eb..31dc928eb0 100644
--- a/libraries/tbl_gis_visualization.lib.php
+++ b/libraries/tbl_gis_visualization.lib.php
@@ -146,11 +146,12 @@ function PMA_getHtmlForGisVisualization(
     $sql_query, $visualization, $svg_support, $data
 ) {
     $url_params['sql_query'] = $sql_query;
-    $url = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params);
+    $downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params)
+        . '&saveToFile=true';
 
     return PMA\Template::get('gis_visualization/gis_visualization')->render(array(
         'url_params' => $url_params,
-        'url' => $url,
+        'downloadUrl' => $downloadUrl,
         'labelCandidates' => $labelCandidates,
         'spatialCandidates' => $spatialCandidates,
         'visualizationSettings' => $visualizationSettings,
diff --git a/templates/gis_visualization/gis_visualization.phtml b/templates/gis_visualization/gis_visualization.phtml
index c2c8a077b3..b224e1cacd 100644
--- a/templates/gis_visualization/gis_visualization.phtml
+++ b/templates/gis_visualization/gis_visualization.phtml
@@ -49,14 +49,14 @@
                     </span>
                     <ul>
                         <li class="warp_link">
-                            <a href="<?php echo $url . '&saveToFile=download&fileFormat=png'; ?>" class="disableAjax">PNG</a>
+                            <a href="<?php echo $downloadUrl . '&fileFormat=png'; ?>" class="disableAjax">PNG</a>
                         </li>
                         <li class="warp_link">
-                            <a href="<?php echo $url . '&saveToFile=download&fileFormat=pdf'; ?>" class="disableAjax">PDF</a>
+                            <a href="<?php echo $downloadUrl . '&fileFormat=pdf'; ?>" class="disableAjax">PDF</a>
                         </li>
                         <?php if ($svg_support): ?>
                             <li class="warp_link">
-                                <a href="<?php echo $url . '&saveToFile=download&fileFormat=svg'; ?>" class="disableAjax">SVG</a>
+                                <a href="<?php echo $downloadUrl . '&fileFormat=svg'; ?>" class="disableAjax">SVG</a>
                             </li>
                         <?php endif; ?>
                     </ul>