Changeset 758015

Timestamp:

08/18/2013 08:02:23 PM (12 years ago)

Author:

Columcille

Message:

Tag 2.3.4 with a fix for passing options to Tippy

Location:

glossy

Files:

• tags/2.3.4 (copied) (copied from glossy/trunk)
• tags/2.3.4/glossy.admin.manageEntries.php (copied) (copied from glossy/trunk/glossy.admin.manageEntries.php)
• tags/2.3.4/glossy.php (copied) (copied from glossy/trunk/glossy.php) (2 diffs)
• tags/2.3.4/readme.txt (copied) (copied from glossy/trunk/readme.txt) (2 diffs)
• trunk/glossy.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

glossy/tags/2.3.4/glossy.php

@@ -4 +4 @@
 Plugin URI: http://croberts.me/glossy/
 Description: Makes it easy to create site-wide glossary or dictionary entries which pop up using the Tippy plugin
-Version: 2.3.3
+Version: 2.3.4
 Author: Chris Roberts
 Author URI: http://croberts.me/
@@ -302 +302 @@
                     $tippyValues['headertext'] = $tippyHeader;
                     $tippyValues['title'] = $tippyTitle;
-                    $tippyValues['href'] = $gs_data['link'];
                     $tippyValues['text'] = $gs_contents;
                     $tippyValues['class'] = isset($attributes['class']) ? $attributes['class'] .'glossy_tip' : 'glossy_tip';
-                    $tippyValues['item'] = 'glossy';
-                    $tippyValues['width'] = $gs_dimensions['width'];
-                    $tippyValues['height'] = $gs_dimensions['height'];
+                    
+                    if (isset($gs_data['link']) && !empty($gs_data['link'])) {
+                        $tippyValues['href'] = $gs_data['link'];
+                    }
+                    
+                    if (isset($gs_data['width']) && !empty($gs_data['width'])) {
+                        $tippyValues['width'] = $gs_data['width'];
+                    }
+                    
+                    if (isset($gs_data['height']) && !empty($gs_data['height'])) {
+                        $tippyValues['height'] = $gs_data['height'];
+                    }
                     
                     $tippyLink = Tippy::getLink($tippyValues);

glossy/tags/2.3.4/readme.txt

@@ -4 +4 @@
 Requires at least: 3.3
 Tested up to: 3.5.1
-Stable tag: 2.3.3
+Stable tag: 2.3.4
 
 Glossy allows you to define information text that can be used throughout your site with a simple shortcode.
@@ -37 +37 @@
 
 == Changelog ==
+
+= 2.3.4 =
+* Fixed how the options are passed to Tippy.
 
 = 2.3.3 =

glossy/trunk/glossy.php

@@ -4 +4 @@
 Plugin URI: http://croberts.me/glossy/
 Description: Makes it easy to create site-wide glossary or dictionary entries which pop up using the Tippy plugin
-Version: 2.3.3
+Version: 2.3.4
 Author: Chris Roberts
 Author URI: http://croberts.me/
@@ -302 +302 @@
                     $tippyValues['headertext'] = $tippyHeader;
                     $tippyValues['title'] = $tippyTitle;
-                    $tippyValues['href'] = $gs_data['link'];
                     $tippyValues['text'] = $gs_contents;
                     $tippyValues['class'] = isset($attributes['class']) ? $attributes['class'] .'glossy_tip' : 'glossy_tip';
-                    $tippyValues['item'] = 'glossy';
-                    $tippyValues['width'] = $gs_dimensions['width'];
-                    $tippyValues['height'] = $gs_dimensions['height'];
+                    
+                    if (isset($gs_data['link']) && !empty($gs_data['link'])) {
+                        $tippyValues['href'] = $gs_data['link'];
+                    }
+                    
+                    if (isset($gs_data['width']) && !empty($gs_data['width'])) {
+                        $tippyValues['width'] = $gs_data['width'];
+                    }
+                    
+                    if (isset($gs_data['height']) && !empty($gs_data['height'])) {
+                        $tippyValues['height'] = $gs_data['height'];
+                    }
                     
                     $tippyLink = Tippy::getLink($tippyValues);

glossy/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.3
 Tested up to: 3.5.1
-Stable tag: 2.3.3
+Stable tag: 2.3.4
 
 Glossy allows you to define information text that can be used throughout your site with a simple shortcode.
@@ -37 +37 @@
 
 == Changelog ==
+
+= 2.3.4 =
+* Fixed how the options are passed to Tippy.
 
 = 2.3.3 =