Merge branch 'release-1.2.6'

Author: mauryaratan

readme.txt

@@ -5,7 +5,7 @@ Donate link: http://codest.ag/st-donate
 Tags: widget, icons, retina, shortcodes, themeforest, font-icons, fontawesome, sidebar, social, social media, maps, flickr, instagram, custom post type, codestag, mauryaratan, twitter
 Requires at least: 3.5
 Tested up to: 4.0
-Stable tag: 1.2.5
+Stable tag: 1.2.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -93,6 +93,9 @@ Yes you can! Join me on [Github Repository](https://github.com/mauryaratan/stagt
 
 == Changelog ==
 
+= 1.2.6 - June 23, 2014 =
+* Fix - Issue with buttons shortcode generator when no link provided
+
 = 1.2.5 - June 18, 2014 =
 * Fix - Twitter widget option storage, works flawlessly
 * Fix - Instagram widget image size styles
@@ -197,6 +200,10 @@ Yes you can! Join me on [Github Repository](https://github.com/mauryaratan/stagt
 * Initial Release
 
 == Upgrade Notice ==
+
+= 1.2.6 =
+Fixes an issue with buttons shortcodes not showing icons in some cases.
+
 = 1.2.5 =
 Includes fixes and improvements for Twitter and Instagram widget.
 

shortcodes/shortcodes.php

@@ -385,7 +385,7 @@ function stag_icon( $atts, $content = null ) {
 	if( $url != '' ){
 		$output .= '<a class="stag-icon-link" '. $a_attrs .'><i class="fa fa-'. $icon .'" style="font-size: '. $size .'; line-height: '. $size .';"></i></a>';
 	}else{
-		$output .= '<i class="stag-icon icon-'. esc_attr($icon) .'" '. $attrs .'></i>';
+		$output .= '<i class="fa fa-'. esc_attr($icon) .'" '. $attrs .'></i>';
 	}
 
 	return $output;

stagtools.php

@@ -3,7 +3,7 @@
  * Plugin Name: StagTools
  * Plugin URI: https://wordpress.org/plugins/stagtools/
  * Description: A poweful plugin to extend functionality to your WordPress themes offering shortcodes, font icons and useful widgets.
- * Version: 1.2.5
+ * Version: 1.2.6
  * Author: Ram Ratan Maurya
  * Author URI: http://mauryaratan.me
  * License: GPL2
@@ -22,7 +22,7 @@
  * Main StagTools Class
  *
  * @package StagTools
- * @version 1.2.5
+ * @version 1.2.6
  * @author Ram Ratan Maurya (Codestag)
  * @link http://mauryaratan.me
  * @link http://codestag.com
@@ -33,7 +33,7 @@ class StagTools {
 	/**
 	* @var string
 	*/
-	public $version = '1.2.5';
+	public $version = '1.2.6';
 
 	/**
 	* @var string