Janitorial: Fix PHP Warnings

Automattic · Jan 6, 2025 · d90a35e · d90a35e
1 parent 56fc7fa
commit d90a35e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+* Undefined array key warnings in various places
+
 ## [4.6.0] - 2024-12-20
 
 ### Added

diff --git a/includes/collection/class-interactions.php b/includes/collection/class-interactions.php
@@ -246,10 +246,10 @@ public static function activity_to_comment( $activity ) {
 			return false;
 		}
 
-		$url = object_to_uri( $actor['url'] );
+		$url = object_to_uri( $actor['url'] ?? $actor['id'] );
 
 		if ( ! $url ) {
-			object_to_uri( $actor['id'] );
+			$url = object_to_uri( $actor['id'] );
 		}
 
 		if ( isset( $activity['object']['content'] ) ) {

diff --git a/includes/transformer/class-post.php b/includes/transformer/class-post.php
@@ -1114,7 +1114,7 @@ public function get_in_reply_to() {
 		$blocks = \parse_blocks( $this->wp_object->post_content );
 
 		foreach ( $blocks as $block ) {
-			if ( 'activitypub/reply' === $block['blockName'] ) {
+			if ( 'activitypub/reply' === $block['blockName'] && isset( $block['attrs']['url'] ) ) {
 				// We only support one reply block per post for now.
 				return $block['attrs']['url'];
 			}

diff --git a/readme.txt b/readme.txt
@@ -132,6 +132,10 @@ For reasons of data protection, it is not possible to see the followers of other
 
 == Changelog ==
 
+= Unreleased =
+
+* Fixed: Undefined array key warnings in various places
+
 = 4.6.0 =
 
 * Added: A filter to allow modifying the ActivityPub preview template

diff --git a/templates/post-preview.php b/templates/post-preview.php
@@ -179,7 +179,7 @@
 	<body>
 		<div class="columns">
 			<aside class="sidebar">
-				<input type="search" disabled="disabled" placeholder="<?php echo esc_html_e( 'Search', 'activitypub' ); ?>" disabled="disabled" />
+				<input type="search" disabled="disabled" placeholder="<?php esc_html_e( 'Search', 'activitypub' ); ?>" />
 				<div>
 					<div class="fake-image"></div>
 					<div>
@@ -218,7 +218,7 @@
 					<div class="attachments">
 						<?php foreach ( $object->get_attachment() as $attachment ) : ?>
 							<?php if ( 'Image' === $attachment['type'] ) : ?>
-								<img src="<?php echo esc_url( $attachment['url'] ); ?>" alt="<?php echo esc_attr( $attachment['name'] ); ?>" />
+								<img src="<?php echo esc_url( $attachment['url'] ); ?>" alt="<?php echo esc_attr( $attachment['name'] ?? '' ); ?>" />
 							<?php endif; ?>
 						<?php endforeach; ?>
 					</div>