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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-09-12 18:07:47 +02:00
commit 306613722d
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/tbl_gis_visualization.lib.php
View File

@ -242,11 +242,11 @@ function PMA_getHtmlForColumn($column, $columnCandidates, $visualizationSettings
}
/**
* Function to get html for the option of using oprn street maps
* Function to get HTML for the option of using open street maps
*
* @param boolean $isSelected the default value
* @param boolean $isSelected the default value
*
* @return string $html
* @return string HTML string
*/
function PMA_getHtmlForUseOpenStreetMaps($isSelected)
{
@ -266,18 +266,18 @@ function PMA_getHtmlForUseOpenStreetMaps($isSelected)
}
/**
* Function to generate html for the GIS visualization page
* Function to generate HTML for the GIS visualization page
*
* @param array $url_params url parameters
* @param array $labelCandidates list of candidates for the label
* @param array $spatialCandidates list of candidates for the spatial column
* @param array $visualizationSettings visualization settings
* @param String $sql_query the sql query
* @param String $visualization html and js code for the visualization
* @param boolean $svg_support whether svg download format is supported
* @param array $data array of visualizing data
* @param array $url_params url parameters
* @param array $labelCandidates list of candidates for the label
* @param array $spatialCandidates list of candidates for the spatial column
* @param array $visualizationSettings visualization settings
* @param String $sql_query the sql query
* @param String $visualization HTML and js code for the visualization
* @param boolean $svg_support whether svg download format is supported
* @param array $data array of visualizing data
*
* @return string $html html code for the GIS visualization
* @return string HTML code for the GIS visualization
*/
function PMA_getHtmlForGisVisualization(
$url_params, $labelCandidates, $spatialCandidates, $visualizationSettings,
@ -301,7 +301,8 @@ function PMA_getHtmlForGisVisualization(
);
$html .= '<tr><td></td>';
$html .= '<td class="button"><input type="submit" name="displayVisualizationBtn" value="';
$html .= '<td class="button"><input type="submit"';
$html .= ' name="displayVisualizationBtn" value="';
$html .= __('Redraw');
$html .= '" /></td></tr>';
@ -318,7 +319,8 @@ function PMA_getHtmlForGisVisualization(
$html .= '</div>';
$html .= '<div style="float:left;">';
$html .= '<form method="post" class="disableAjax" action="tbl_gis_visualization.php">';
$html .= '<form method="post" class="disableAjax"';
$html .= ' action="tbl_gis_visualization.php">';
$html .= PMA_URL_getHiddenInputs($url_params);
$html .= '<table class="gis_table">';
$html .= '<tr><td><label for="fileName">';

2
test/engines/PMA_StorageEngine_pbxt_test.php
View File

@ -122,6 +122,7 @@ class PMA_StorageEngine_pbxt_Test extends PHPUnit_Framework_TestCase
/**
* Test for resolveTypeSize
*
* @param string $formatted_size the size expression (for example 8MB)
*
* @dataProvider providerFortTestResolveTypeSize
@ -136,6 +137,7 @@ class PMA_StorageEngine_pbxt_Test extends PHPUnit_Framework_TestCase
/**
* Provider for testResolveTypeSize
*
* @return array
*/
public function providerFortTestResolveTypeSize()

2
url.php
View File

@ -9,7 +9,7 @@
/**
* Gets core libraries and defines some variables
*/
define('PMA_MINIMUM_COMMON', True);
define('PMA_MINIMUM_COMMON', true);
require_once './libraries/common.inc.php';
if (! PMA_isValid($_GET['url'])