Skip to content
Snippets Groups Projects
Commit 50c1938b authored by webgeer's avatar webgeer
Browse files

fixed final bug in http://drupal.org/node/63951

parent 2b06b757
No related branches found
No related tags found
No related merge requests found
...@@ -76,10 +76,11 @@ function gmap_location_users_page() { ...@@ -76,10 +76,11 @@ function gmap_location_users_page() {
$newmarker['label'] .= theme('username', $account); $newmarker['label'] .= theme('username', $account);
$newmarker['point']= $u->latitude.','.$u->longitude; $newmarker['point']= $u->latitude.','.$u->longitude;
$newmarker['markername']=variable_get('gmap_user_map_marker', 'drupal'); $newmarker['markername']=variable_get('gmap_user_map_marker', 'drupal');
$newmarker['tooltip']=$account->name; $newmarker['tooltip']=check_plain($account->name);
} }
else { else {
$newmarker['point']= $u->latitude.', '.$u->longitude; $newmarker['point']= $u->latitude.', '.$u->longitude;
$newmarker['markername']=variable_get('gmap_user_map_marker', 'drupal');
} }
$thismap['markers'][]=$newmarker; $thismap['markers'][]=$newmarker;
} }
...@@ -131,7 +132,7 @@ function gmap_location_node_page($nn=null) { ...@@ -131,7 +132,7 @@ function gmap_location_node_page($nn=null) {
// strtr($newmarker['label'],"'\n",'" '); // strtr($newmarker['label'],"'\n",'" ');
break; break;
case 'image': case 'image':
$newmarker['label'] = '<a href="'.url('node/'.$locn->oid).'">'.$n->title.'</a> <br>'; $newmarker['label'] = '<a href="'.url('node/'.$n->nid).'">'.check_plain($n->title).'</a> <br>';
$newmarker['label'] .= image_display($n,'thumbnail'); $newmarker['label'] .= image_display($n,'thumbnail');
break; break;
default: default:
...@@ -139,7 +140,7 @@ function gmap_location_node_page($nn=null) { ...@@ -139,7 +140,7 @@ function gmap_location_node_page($nn=null) {
} }
$newmarker['point']= $locn->latitude.','.$locn->longitude; $newmarker['point']= $locn->latitude.','.$locn->longitude;
$newmarker['markername']=variable_get('gmap_node_map_marker_'.$n->type, ''); $newmarker['markername']=variable_get('gmap_node_map_marker_'.$n->type, '');
$newmarker['tooltip']=$n->title; $newmarker['tooltip']=check_plain($n->title);
$thismap['markers'][]=$newmarker; $thismap['markers'][]=$newmarker;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment