Changeset 8776 for extensions/rv_gmaps

Timestamp:

Jan 19, 2011, 10:53:58 PM (13 years ago)

Author:

rvelices

Message:

rv_gmaps prepare for core 2.2

Location:

extensions/rv_gmaps/trunk

Files:

• include/functions_map.php (modified) (2 diffs)
• main.inc.php (modified) (3 diffs)

extensions/rv_gmaps/trunk/include/functions_map.php

@@ -477 +477 @@
   else if ('tags' == $page['section'])
   {
-    $items = get_image_ids_for_tags( array($page['tags'][0]['id']) );
+    $items = get_image_ids_for_tags( array($page['tags'][0]['id']), 'AND', $where_sql_images_only, 'ORDER BY NULL' );
     if ( !empty($items) )
     {
@@ -483 +483 @@
 SELECT '.$img_fields.'
   FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' i ON i.id=image_id
-  WHERE '.$where_sql.'
-    AND image_id IN ('.implode(',', $items).')'
+  WHERE image_id IN ('.implode(',', $items).')'
   .$group_by.'
   '.$conf['order_by'];

extensions/rv_gmaps/trunk/main.inc.php

@@ -40 +40 @@
 }
 
-define('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>');
+define('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>');
 
 function rvm_end_index()
@@ -80 +78 @@
         {
                 $link_title = sprintf( l10n('displays %s on a map'), strip_tags($page['title']) );
-                $template->concat( 'PLUGIN_INDEX_ACTIONS' , '<li>'.sprintf(RVM_ACTION_MODEL,
+                $template->concat( 'PLUGIN_INDEX_ACTIONS' , "\n<li>".sprintf(RVM_ACTION_MODEL,
                         $map_url, $link_title, '', 'map', 'map'
                         ).'</li>');
-        }
+        }
 
         {
                 $kml_url = rvm_duplicate_kml_index_url( array(), array('start') );
                 $link_title = sprintf( l10n('opens %s in Google Earth'), strip_tags($page['title']) );
-                $template->concat( 'PLUGIN_INDEX_ACTIONS' , '<li>'.sprintf(RVM_ACTION_MODEL,
-                        $kml_url, $link_title, 'type="application/vnd.google-earth.kml+xml"', 'globe', 'earth'
+                $template->concat( 'PLUGIN_INDEX_ACTIONS' , "\n<li>".sprintf(RVM_ACTION_MODEL,
+                        $kml_url, $link_title, ' type="application/vnd.google-earth.kml+xml"', 'globe', 'earth'
                         ).'</li>');
         }
@@ -112 +110 @@
                                 $link_title = sprintf( l10n('displays %s on a map'), strip_tags($pictures['current']['name']) );
                                 $template->concat( 'PLUGIN_PICTURE_ACTIONS' , sprintf(RVM_ACTION_MODEL,
-                                        $map_url, $link_title, 'target="_top"', 'map', 'map'
+                                        $map_url, $link_title, ' target="_top"', 'map', 'map'
                                 ));
                         }