Version bump and dependency updates

dshanske · dshanske · commit ed8aa46e7ffe · 2018-07-14T19:00:27.000-05:00
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 4.8.2  
 **Requires PHP:** 5.4  
 **Tested up to:** 4.9.7  
-**Stable tag:** 3.8.0  
+**Stable tag:** 3.8.1  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -87,7 +87,10 @@ The plugin uses a locally cached version of the mystery icon normally provided b
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
 ### 3.8.1 ###
-* All follow post as type
+* Add follow post as type
+* Add warning to settings page if php-mbstring not installed
+* Return false in Emoji function if php-mbstring not installed
+* Add approve link to emails sent
 
 ### 3.8.0 ###
 
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
   "require": {
     "php": ">=5.3.0",
     "composer/installers": "~1.0",
-    "mf2/mf2": "^0.4.2",
+    "mf2/mf2": "^0.4.3",
     "p3k/emoji-detector": "^0.2.0"
   },
   "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/includes/class-linkbacks-walker-comment.php b/includes/class-linkbacks-walker-comment.php
@@ -53,6 +53,10 @@ protected static function get_comment_author_link( $comment_id = 0 ) {
 	}
 
 	protected static function is_reaction( $comment ) {
+		// If this library is not installed then emoji detection will not work
+		if ( ! function_exists( 'mb_internal_encoding' ) ) {
+			return false;
+		}
 		return Emoji\is_single_emoji( trim( wp_strip_all_tags( $comment->comment_content ) ) ) && empty( $comment->comment_parent );
 	}
 
diff --git a/readme.txt b/readme.txt
@@ -5,7 +5,7 @@ Tags: webmention, pingback, trackback, linkback, microformats, comments, indiewe
 Requires at least: 4.8.2
 Requires PHP: 5.4
 Tested up to: 4.9.7
-Stable tag: 3.8.0
+Stable tag: 3.8.1
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -87,7 +87,10 @@ The plugin uses a locally cached version of the mystery icon normally provided b
 Project actively developed on Github at [pfefferle/wordpress-semantic-linkbacks](https://github.com/pfefferle/wordpress-semantic-linkbacks). Please file support issues there.
 
 = 3.8.1 =
-* All follow post as type
+* Add follow post as type
+* Add warning to settings page if php-mbstring not installed
+* Return false in Emoji function if php-mbstring not installed
+* Add approve link to emails sent
 
 = 3.8.0 =
 
diff --git a/semantic-linkbacks.php b/semantic-linkbacks.php
@@ -132,6 +132,12 @@ public static function plugin_textdomain() {
 	 */
 	public static function settings() {
 		_e( 'For webmentions that do not have avatars you can pick from several locally served default avatars in the Discussion Settings', 'semantic-linkbacks' );
+
+		if ( ! function_exists( 'mb_internal_encoding' ) ) {
+?>
+		<p class="notice notice-warning"><?php _e( 'This server does not have the php-mbstring package installed and Emoji reactions have been disabled.', 'semantic-linkbacks' ); ?></p>
+<?php
+		}
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ protected static function get_comment_author_link( $comment_id = 0 ) {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`protected static function is_reaction( $comment ) {`
	`56`	`+ // If this library is not installed then emoji detection will not work`
	`57`	`+ if ( ! function_exists( 'mb_internal_encoding' ) ) {`
	`58`	`+ return false;`
	`59`	`+ }`
`56`	`60`	`return Emoji\is_single_emoji( trim( wp_strip_all_tags( $comment->comment_content ) ) ) && empty( $comment->comment_parent );`
`57`	`61`	`}`
`58`	`62`