Merge branch 'develop'

Author: jrfnl

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for TGM Plugin Activation library
 
+## 2.6.1 (2016-05-19)
+
+* Fix a string replacement issue in the plugin action links. Thanks [Nilambar Sharma] for reporting. [#587], [#588]
+
 ## 2.6.0 (2016-05-14)
 
 Since mid-February we offer a _"Custom TGMPA Generator"_. From now on, that is the preferred way for downloading your copy of TGMPA for use in a theme or plugin.
@@ -324,6 +328,7 @@ TGMPA will start providing localized text strings soon. If you already have tran
 [Mika Epstein]: https://github.com/Ipstenu
 [Mohamed A. Baset]: https://github.com/SymbianSyMoh
 [Nate Wright]: https://github.com/NateWr
+[Nilambar Sharma]: https://github.com/ernilambar
 [Ninos Ego]: https://github.com/Ninos
 [Ollie Treend]: https://github.com/ollietreend
 [Parhum Khoshbakht]: https://github.com/parhumm
@@ -349,6 +354,8 @@ TGMPA will start providing localized text strings soon. If you already have tran
 [Marciel Bartzik]: http://www.bartzik.net/
 [Zauan/Hogash Studio]: http://pastebin.com/u/Zauan
 
+[#588]: https://github.com/TGMPA/TGM-Plugin-Activation/pull/588
+[#587]: https://github.com/TGMPA/TGM-Plugin-Activation/issues/587
 [#577]: https://github.com/TGMPA/TGM-Plugin-Activation/pull/577
 [#574]: https://github.com/TGMPA/TGM-Plugin-Activation/pull/574
 [#571]: https://github.com/TGMPA/TGM-Plugin-Activation/pull/571

README.md

@@ -6,7 +6,7 @@
 
 **Lead Developers:**
 [Thomas Griffin](https://github.com/thomasgriffin) ([@jthomasgriffin](https://twitter.com/jthomasgriffin)), [Gary Jones](https://github.com/GaryJones) ([@GaryJ](https://twitter.com/GaryJ)), [Juliette Reinders Folmer](https://github.com/jrfnl) ([@jrf_nl](https://twitter.com/jrf_nl))  
-**Version:** 2.6.0-RC1 
+**Version:** 2.6.1
 **Requires at least:** 3.7.0 
 **Tested up to:** 4.5.2 
 

class-tgm-plugin-activation.php

@@ -8,7 +8,7 @@
  * or theme author for support.
  *
  * @package   TGM-Plugin-Activation
- * @version   2.6.0
+ * @version   2.6.1
  * @link      http://tgmpluginactivation.com/
  * @author    Thomas Griffin, Gary Jones, Juliette Reinders Folmer
  * @copyright Copyright (c) 2011, Thomas Griffin
@@ -55,7 +55,7 @@ class TGM_Plugin_Activation {
 		 *
 		 * @const string Version number.
 		 */
-		const TGMPA_VERSION = '2.6.0';
+		const TGMPA_VERSION = '2.6.1';
 
 		/**
 		 * Regular expression to test if a URL is a WP plugin repo URL.
@@ -2692,19 +2692,19 @@ protected function get_row_actions( $item ) {
 
 			// Display the 'Install' action link if the plugin is not yet available.
 			if ( ! $this->tgmpa->is_plugin_installed( $item['slug'] ) ) {
-				/* translators: %s: plugin name in screen reader markup */
-				$actions['install'] = __( 'Install %s', 'tgmpa' );
+				/* translators: %2$s: plugin name in screen reader markup */
+				$actions['install'] = __( 'Install %2$s', 'tgmpa' );
 			} else {
 				// Display the 'Update' action link if an update is available and WP complies with plugin minimum.
 				if ( false !== $this->tgmpa->does_plugin_have_update( $item['slug'] ) && $this->tgmpa->can_plugin_update( $item['slug'] ) ) {
-					/* translators: %s: plugin name in screen reader markup */
-					$actions['update'] = __( 'Update %s', 'tgmpa' );
+					/* translators: %2$s: plugin name in screen reader markup */
+					$actions['update'] = __( 'Update %2$s', 'tgmpa' );
 				}
 
 				// Display the 'Activate' action link, but only if the plugin meets the minimum version.
 				if ( $this->tgmpa->can_plugin_activate( $item['slug'] ) ) {
-					/* translators: %s: plugin name in screen reader markup */
-					$actions['activate'] = __( 'Activate %s', 'tgmpa' );
+					/* translators: %2$s: plugin name in screen reader markup */
+					$actions['activate'] = __( 'Activate %2$s', 'tgmpa' );
 				}
 			}
 
@@ -2723,7 +2723,7 @@ protected function get_row_actions( $item ) {
 				);
 
 				$action_links[ $action ] = sprintf(
-					'<a href="%1$s">' . esc_html( $text ) . '</a>',
+					'<a href="%1$s">' . esc_html( $text ) . '</a>', // $text contains the second placeholder.
 					esc_url( $nonce_url ),
 					'<span class="screen-reader-text">' . esc_html( $item['sanitized_plugin'] ) . '</span>'
 				);

example.php

@@ -10,7 +10,7 @@
  *
  * @package    TGM-Plugin-Activation
  * @subpackage Example
- * @version    2.6.0
+ * @version    2.6.1
  * @author     Thomas Griffin, Gary Jones, Juliette Reinders Folmer
  * @copyright  Copyright (c) 2011, Thomas Griffin
  * @license    http://opensource.org/licenses/gpl-2.0.php GPL v2 or later