Skip to content

Commit 0b99bba

Browse files
author
Emmanuel Garette
committed
some corrections
1 parent b8dfe4c commit 0b99bba

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

admin/admin_gps.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
$upload_file = array();
3939

4040
if($_FILES['file_uploaded']['size'] != 0) {
41-
$upload_file = gps_upload_file(pwg_db_real_escape_string($_FILES['file_uploaded']));
41+
$upload_file = gps_upload_file($_FILES['file_uploaded']);
4242
if(count($upload_file['errors']) != 0)
4343
$uploaded_errors['file'] = $upload_file['errors'];
4444
} else {
@@ -61,8 +61,9 @@ function gps_upload_file($uploaded_file) {
6161
$uploaded_galleries_dir = PHPWG_ROOT_PATH.'galleries/gps/';
6262
$uploaded_file_tmp = $uploaded_file['tmp_name'];
6363
$uploaded_file_name = preg_replace('/[^a-zA-Z0-9s.]/', '_', $uploaded_file['name']);
64-
$uploaded_file_destination = $uploaded_galleries_dir . '/' . $uploaded_file_name;
65-
$ext = pathinfo($uploaded_file_name)['extension'];
64+
$uploaded_file_destination = $uploaded_galleries_dir . $uploaded_file_name;
65+
$ext = pathinfo($uploaded_file_name);
66+
$ext = $ext['extension'];
6667
$uploaded_errors = array();
6768
if(!in_array($ext, array('csv', 'gpx', 'kml', 'wkt', 'topojson', 'geojson'))) {
6869
$uploaded_errors['upload_error'] = l10n('Extension not supported');

include/functions_map.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,8 @@ function osm_get_js($conf, $local_conf, $js_data)
393393
\t}";
394394
if (isset($local_conf['paths'])) {
395395
foreach ($local_conf['paths'] as $path) {
396-
$ext = pathinfo($path)['extension'];
396+
$ext = pathinfo($path);
397+
$ext = $ext['extension'];
397398
$js .= "\nomnivore.".$ext."('".$path."').addTo(".$divname.");";
398399
}
399400
}

0 commit comments

Comments
 (0)