← Back to branch summary

~ubuntu-branches/ubuntu/utopic/phpmyadmin/utopic

« back to all changes in this revision

Viewing changes to libraries/tbl_gis_visualization.lib.php

  • Committer: Package Import Robot
  • Author(s): Michal Čihař
  • Date: 2014-05-10 16:31:42 UTC
  • mfrom: (1.2.55)
  • Revision ID: package-import@ubuntu.com-20140510163142-z03w5qirp4nnfoiy
Tags: 4:4.2.0-1
http://bugs.debian.org/746956
* New upstream release.
* Upgrade database for current phpMyAdmin configuration storage and
  in the configuration (Closes: #746956).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/tbl_gis_visualization.lib.php
82
82
        if (isset($visualizationSettings['labelColumn'])
83
83
            && $visualizationSettings['labelColumn'] != ''
84
84
        ) {
85
 
            $modified_query .= '`' . $visualizationSettings['labelColumn'] .'`, ';
 
85
            $modified_query .= '`' . $visualizationSettings['labelColumn'] . '`, ';
86
86
        }
87
87
 
88
88
        // Wrap the spatial column with 'ASTEXT()' function and add it
136
136
 */
137
137
function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format)
138
138
{
139
 
    include_once './libraries/gis/pma_gis_visualization.php';
140
 
    include_once './libraries/gis/pma_gis_factory.php';
 
139
    include_once './libraries/gis/GIS_Visualization.class.php';
 
140
    include_once './libraries/gis/GIS_Factory.class.php';
141
141
 
142
142
    if (! isset($data[0])) {
143
143
        // empty data
173
173
 */
174
174
function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName)
175
175
{
176
 
    include_once './libraries/gis/pma_gis_visualization.php';
177
 
    include_once './libraries/gis/pma_gis_factory.php';
 
176
    include_once './libraries/gis/GIS_Visualization.class.php';
 
177
    include_once './libraries/gis/GIS_Factory.class.php';
178
178
 
179
179
    if (isset($data[0])) {
180
180
        $visualization = new PMA_GIS_Visualization($data, $visualizationSettings);