Changeset 22180


Ignore:
Timestamp:
Apr 12, 2013, 10:27:33 PM (11 years ago)
Author:
rvelices
Message:

rv_gmaps: more forgiving about some wrong exif gps formatting + small technical stuff

Location:
extensions/rv_gmaps/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • extensions/rv_gmaps/trunk/changelog.txt

    r18951 r22180  
     12.5.b
     2- more forgiving about some wrong exif gps formatting
     3
    142.5.a
    25- piwigo 2.5

  • extensions/rv_gmaps/trunk/include/functions_map.php

    r20461 r22180  
    3838function rvm_parse_map_data_url($tokens, &$next_token)
    3939{
    40   $page=array();
    41 
    42   $page = array_merge($page, parse_section_url($tokens, $next_token) );
     40  $page = parse_section_url($tokens, $next_token);
    4341  if ( !isset($page['section']) )
    4442    $page['section'] = 'categories';
    … …  
    5250function rvm_parse_kml_url($tokens, &$next_token)
    5351{
    54   $page=array();
    55 
    56   $page = array_merge($page, parse_section_url($tokens, $next_token) );
     52  $page = parse_section_url($tokens, $next_token);
    5753  if ( !isset($page['section']) )
    5854    $page['section'] = 'categories';
    … …  
    10096function rvm_parse_blowup_url($tokens, &$next_token)
    10197{
    102   $page=array();
    103   $page = array_merge($page, parse_section_url($tokens, $next_token) );
     98  $page = parse_section_url($tokens, $next_token);
    10499  if ( !isset($page['section']) )
    105100    $page['section'] = 'categories';

  • extensions/rv_gmaps/trunk/include/functions_metadata.php

    r12701 r22180  
    33{
    44        $nd = explode( '/', $f );
    5         return $nd[0]/$nd[1];
     5        return $nd[0] ? ($nd[0]/$nd[1]) : 0;
    66}
    77

  • extensions/rv_gmaps/trunk/main.inc.php

    r20983 r22180  
    11<?php /*
    22Plugin Name: RV Maps&Earth
    3 Version: 2.5.a
     3Version: 2.5.b
    44Description: Extend your gallery with Google Maps and Google Earth ...
    55Plugin URI: http://piwigo.org/ext/extension_view.php?eid=122
    … …  
    77Author URI: http://www.modusoptimus.com/
    88*/
    9 define( 'RVM_PLUGIN_VERSION', '2.5.a');
     9define( 'RVM_PLUGIN_VERSION', '2.5.b');
    1010defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
    1111

  • extensions/rv_gmaps/trunk/template/map.tpl

    r19683 r22180  
    88
    99<script src="http://maps.googleapis.com/maps/api/js?sensor=false&amp;language={$lang_info.code}&amp;libraries=places" type="text/javascript"></script>
    10 {combine_script id='jquery' load='header' path='http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js'}
     10{combine_script id='jquery' load='header' path='http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js'}
    1111{combine_script id='jquery.colorbox' load='async' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'}
    1212{combine_css path="`$PLUGIN_LOCATION`/template/style.css" version=$RVM_PLUGIN_VERSION}

  • extensions/rv_gmaps/trunk/template/picture_map_content.tpl

    r21892 r22180  
    2222
    2323<div id="mapPicture">
    24 <a href="{$U_NO_MAP}" title="{'return to normal view mode'|@translate}" rel="nofollow"><img src="{$current.THUMB_SRC}" alt="thumb"/></a>
     24<a href="{$U_NO_MAP}" title="{'return to normal view mode'|@translate}" rel="nofollow"><img src="{$current.THUMB_SRC}" alt="thumb"></a>
    2525<br/>
    2626<a href="{$U_BLOWUP}" onclick="return blowupUrl(this.href);">{'More photos near this location'|@translate}</a>
Note: See TracChangeset for help on using the changeset viewer.