Changeset 8776 for extensions/rv_gmaps


Ignore:
Timestamp:
01/19/11 22:53:58 (9 years ago)
Author:
rvelices
Message:

rv_gmaps prepare for core 2.2

Location:
extensions/rv_gmaps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/rv_gmaps/trunk/include/functions_map.php

    r3447 r8776  
    477477  else if ('tags' == $page['section']) 
    478478  { 
    479     $items = get_image_ids_for_tags( array($page['tags'][0]['id']) ); 
     479    $items = get_image_ids_for_tags( array($page['tags'][0]['id']), 'AND', $where_sql_images_only, 'ORDER BY NULL' ); 
    480480    if ( !empty($items) ) 
    481481    { 
     
    483483SELECT '.$img_fields.' 
    484484  FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' i ON i.id=image_id 
    485   WHERE '.$where_sql.' 
    486     AND image_id IN ('.implode(',', $items).')' 
     485  WHERE image_id IN ('.implode(',', $items).')' 
    487486  .$group_by.' 
    488487  '.$conf['order_by']; 
  • extensions/rv_gmaps/trunk/main.inc.php

    r8304 r8776  
    4040} 
    4141 
    42 define('RVM_ACTION_MODEL', '<a href="%s" title="%s" rel="nofollow" class="pwg-state-default pwg-button" %s> 
    43         <span class="pwg-icon pwg-icon-%s">&nbsp;</span><span class="pwg-button-text">%s</span> 
    44 </a>'); 
     42define('RVM_ACTION_MODEL', '<a href="%s" title="%s" rel="nofollow" class="pwg-state-default pwg-button"%s><span class="pwg-icon pwg-icon-%s">&nbsp;</span><span class="pwg-button-text">%s</span></a>'); 
    4543 
    4644function rvm_end_index() 
     
    8078        { 
    8179                $link_title = sprintf( l10n('displays %s on a map'), strip_tags($page['title']) ); 
    82                 $template->concat( 'PLUGIN_INDEX_ACTIONS' , '<li>'.sprintf(RVM_ACTION_MODEL, 
     80                $template->concat( 'PLUGIN_INDEX_ACTIONS' , "\n<li>".sprintf(RVM_ACTION_MODEL, 
    8381                        $map_url, $link_title, '', 'map', 'map' 
    8482                        ).'</li>'); 
    85         } 
     83        } 
    8684 
    8785        { 
    8886                $kml_url = rvm_duplicate_kml_index_url( array(), array('start') ); 
    8987                $link_title = sprintf( l10n('opens %s in Google Earth'), strip_tags($page['title']) ); 
    90                 $template->concat( 'PLUGIN_INDEX_ACTIONS' , '<li>'.sprintf(RVM_ACTION_MODEL, 
    91                         $kml_url, $link_title, 'type="application/vnd.google-earth.kml+xml"', 'globe', 'earth' 
     88                $template->concat( 'PLUGIN_INDEX_ACTIONS' , "\n<li>".sprintf(RVM_ACTION_MODEL, 
     89                        $kml_url, $link_title, ' type="application/vnd.google-earth.kml+xml"', 'globe', 'earth' 
    9290                        ).'</li>'); 
    9391        } 
     
    112110                                $link_title = sprintf( l10n('displays %s on a map'), strip_tags($pictures['current']['name']) ); 
    113111                                $template->concat( 'PLUGIN_PICTURE_ACTIONS' , sprintf(RVM_ACTION_MODEL, 
    114                                         $map_url, $link_title, 'target="_top"', 'map', 'map' 
     112                                        $map_url, $link_title, ' target="_top"', 'map', 'map' 
    115113                                )); 
    116114                        } 
Note: See TracChangeset for help on using the changeset viewer.