Changeset 23519


Ignore:
Timestamp:
06/24/13 22:39:31 (6 years ago)
Author:
rvelices
Message:

rv_gmaps for piwigo 2.6

Location:
extensions/rv_gmaps/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • extensions/rv_gmaps/trunk/changelog.txt

    r23186 r23519  
     12.6.a 
     2- piwigo 2.6 
     3 
    142.5.d 
    25- avoid mixed content warnings when used over https 
  • extensions/rv_gmaps/trunk/include/functions.php

    r20461 r23519  
    1212} 
    1313 
    14 function rvm_load_language() 
     14function rvm_load_language($source=false) 
    1515{ 
    16         global $lang,$lang_info,$conf; 
    17         if ( isset($lang['Map']) or ($lang_info['code']=='en' and !$conf['debug_l10n']) ) 
    18                 return; 
    19         load_language('lang', dirname(__FILE__).'/../'); 
     16        global $lang,$lang_info,$conf,$template; 
     17        if ( !isset($lang['Map']) ) 
     18        { 
     19                if ( $lang_info['code']!='en' || $conf['debug_l10n'] || $source!==false) 
     20                        load_language('lang', dirname(__FILE__).'/../'); 
     21                else 
     22                        $template->smarty->registerFilter('pre', 'rvm_load_language'); 
     23        } 
     24        return $source; 
    2025} 
    2126 
  • extensions/rv_gmaps/trunk/main.inc.php

    r23186 r23519  
    11<?php /* 
    22Plugin Name: RV Maps&Earth 
    3 Version: 2.5.d 
     3Version: 2.6.a 
    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.d'); 
     9define( 'RVM_PLUGIN_VERSION', '2.6.a'); 
    1010defined('PHPWG_ROOT_PATH') or die('Hacking attempt!'); 
    1111 
Note: See TracChangeset for help on using the changeset viewer.