Changeset 1476

Timestamp:

07/09/11 18:14:14 (23 months ago)

Author:

Torben Brodt

Message:

gmap bbcode: release fix for zoom

Location:

g-map/optionals/de.gmap.wcf.data.message.bbcode.map

Files:

• files/lib/data/message/bbcode/MapBBCode.class.php (modified) (2 diffs)
• package.xml (modified) (2 diffs)
• templates/mapBBCode.tpl (modified) (1 diff)

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/files/lib/data/message/bbcode/MapBBCode.class.php

@@ -119 +119 @@
         private function show($stream, $zoom) {
                 WCF::getTPL()->assign(array(
-                        'bbcodemap_zoom' => $zoom,
+                        'bbcodemap_zoom' => intval($zoom),
                         'bbcodemap_data' => $stream
                 ));
@@ -131 +131 @@
         public function getParsedTag($openingTag, $content, $closingTag, BBCodeParser $parser) {
         
-                $zoom = isset($openingTag['attributes'][0]) ? $openingTag['attributes'][0] : GMAP_ZOOM;
+                $zoom = isset($openingTag['attributes'][0]) ? intval($openingTag['attributes'][0]) : 0;
                 $content = explode("\n", StringUtil::unifyNewlines($content));
                 

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/package.xml

@@ -6 +6 @@
                 <packagedescription><![CDATA[This BBCode allows you to add a map with infinite markers to your posting.]]></packagedescription>
                 <isunique>1</isunique>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf.data.message.bbcode</plugin>
@@ -31 +31 @@
         </instructions>
         
+        <instructions type="update" fromversion="3.0.0">
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+        </instructions>
+        
         <instructions type="update" fromversion="3.0.0 Beta 1">
+                <files>files.tar</files>
                 <templates>templates.tar</templates>
         </instructions>
         
         <instructions type="update" fromversion="2.0.3">
+                <files>files.tar</files>
                 <templates>templates.tar</templates>
-                <files>files.tar</files>
         </instructions>
         

g-map/optionals/de.gmap.wcf.data.message.bbcode.map/templates/mapBBCode.tpl

@@ -26 +26 @@
                         gmap.loadMarkers(coordinates);
                         gmap.showMap();
+                        {if $bbcodemap_zoom}gmap.gmap.setZoom({$bbcodemap_zoom});{/if}
                 }
         };