Skip to content

Commit a8971c4

Browse files
committed
Fix show pictures without name #18
1 parent d5c5d43 commit a8971c4

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

osmmap2.php

100644100755
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@
113113
$osm_sub_album = create_virtual_category("OSM".$_GET['min_lat']."", $osm_album['id'], $options);
114114

115115
/* Get all items inside the lat and lng */
116-
$query="SELECT `id`, `latitude`, `longitude`, `name`
116+
$query="SELECT `id`, `latitude`, `longitude`, IFNULL(`name`, '') AS `name`
117117
FROM ".IMAGES_TABLE."
118118
WHERE `latitude` IS NOT NULL AND `longitude` IS NOT NULL
119119
AND `latitude` > ".$_GET['min_lat']." AND `latitude` < ".$_GET['max_lat']."
120120
AND `longitude` > ".$_GET['min_lng']." AND `longitude` < ".$_GET['max_lng']."
121-
group by `name`;";
121+
;";
122122

123123
$items = hash_from_query( $query, 'id');
124124

@@ -149,7 +149,8 @@
149149
// SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1) full path without filename extension
150150
// SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1) full path with only filename extension
151151

152-
$query="SELECT `latitude`, `longitude`, `name`,
152+
$query="SELECT `latitude`, `longitude`,
153+
IFNULL(`name`, '') AS `name`,
153154
IF(`representative_ext` IS NULL,
154155
CONCAT(SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', 1 ), '-sq.', SUBSTRING_INDEX(TRIM(LEADING '.' FROM `path`), '.', -1 )),
155156
TRIM(LEADING '.' FROM
@@ -169,7 +170,7 @@
169170
`width`
170171
FROM ".IMAGES_TABLE." AS i
171172
INNER JOIN ".IMAGE_CATEGORY_TABLE." AS ic ON id = ic.image_id
172-
WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." group by `name`;";
173+
WHERE ".$LIMIT_SEARCH." `latitude` IS NOT NULL AND `longitude` IS NOT NULL ".$forbidden." ;";
173174
//echo $query;
174175
$php_data = array_from_query($query);
175176
//print_r($php_data);

0 commit comments

Comments
 (0)