Fixfor urls and hashtags in profiles are not converted (#940)

Automattic · Oct 14, 2024 · 7c0cb7f · 7c0cb7f
1 parent 17f99cd
commit 7c0cb7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/includes/class-hashtag.php b/includes/class-hashtag.php
@@ -33,11 +33,11 @@ public static function init() {
 	 */
 	public static function filter_activity_object( $activity ) {
 		/* phpcs:ignore Squiz.PHP.CommentedOutCode.Found
-		Removed until this is merged: https://github.com/mastodon/mastodon/pull/28629
-		if ( ! empty( $activity['summary'] ) ) {
+		Only changed it for Person and Group as long is not merged: https://github.com/mastodon/mastodon/pull/28629
+		*/
+		if ( ! empty( $activity['summary'] ) && in_array( $activity['type'], array( 'Person', 'Group' ), true ) ) {
 			$activity['summary'] = self::the_content( $activity['summary'] );
 		}
-		*/
 
 		if ( ! empty( $activity['content'] ) ) {
 			$activity['content'] = self::the_content( $activity['content'] );

diff --git a/includes/class-link.php b/includes/class-link.php
@@ -29,11 +29,11 @@ public static function init() {
 	 */
 	public static function filter_activity_object( $activity ) {
 		/* phpcs:ignore Squiz.PHP.CommentedOutCode.Found
-		Removed until this is merged: https://github.com/mastodon/mastodon/pull/28629
-		if ( ! empty( $activity['summary'] ) ) {
+		Only changed it for Person and Group as long is not merged: https://github.com/mastodon/mastodon/pull/28629
+		*/
+		if ( ! empty( $activity['summary'] ) && in_array( $activity['type'], array( 'Person', 'Group' ), true ) ) {
 			$activity['summary'] = self::the_content( $activity['summary'] );
 		}
-		*/
 
 		if ( ! empty( $activity['content'] ) ) {
 			$activity['content'] = self::the_content( $activity['content'] );