Changeset 16011 for extensions/GMaps/gmaps_pip.class.inc.php

Timestamp:

Jun 24, 2012, 9:17:04 PM (12 years ago)

Author:

grum

Message:

feature:2638- compatibility with Piwigo 2.4

File:

• extensions/GMaps/gmaps_pip.class.inc.php (modified) (5 diffs)

extensions/GMaps/gmaps_pip.class.inc.php

@@ -52 +52 @@
       )
   );
-  protected $css2;
 
   public function __construct($prefixeTable, $filelocation)
   {
     parent::__construct($prefixeTable, $filelocation);
-    $this->css2 = new GPCCss(dirname($this->getFileLocation()).'/'.$this->getPluginNameFiles()."2.css");
     $this->loadConfig();
     $this->initEvents();
@@ -86 +84 @@
   {
     parent::initEvents();
-
     add_event_handler('loc_begin_index', array(&$this, 'displayCategoryPageMap'));
     if(!isset($_GET['slideshow'])) add_event_handler('loc_begin_picture', array(&$this, 'displayPicturePageMap'), EVENT_HANDLER_PRIORITY_NEUTRAL+5);
     add_event_handler('amd_jpegMD_loaded', array(&$this, 'preparePictureMaps'));
-    add_event_handler('loc_end_page_header', array(&$this->css2, 'applyCSS'));
     add_event_handler('render_category_description',  array(&$this, 'categoryMarkup'), EVENT_HANDLER_PRIORITY_NEUTRAL-5, 2);
   }
 
 
+  public function loadCSS()
+  {
+    //parent::loadCSS(); // -- do not call ancestor!
+    GPCCore::addHeaderCSS('gmaps.css2', 'plugins/'.$this->getDirectory().'/'.$this->getPluginNameFiles()."2.css");
+  }
 
   /* -------------------------------------------------------------------------
@@ -213 +214 @@
             gmaps =
               {
+                token:'".get_pwg_token()."',
                 lang:{
                   boundmap:'".l10n('gmaps_i_boundmap')."',
@@ -306 +308 @@
 var gmaps =
   {
+    token:'".get_pwg_token()."',
     geolocated:".($nb>0?'true':'false').",
     forceDisplay:".($nb==0?'true':'false').",
@@ -503 +506 @@
   var gmaps =
     {
+      token:'".get_pwg_token()."',
       geolocated:".($this->picture['geolocated']?'true':'false').",
       forceDisplay:".($this->picture['forceDisplay']?'true':'false').",