Use make_clickable to format manufacturer address. Use attachment cap…

…tion (if available) to output safety attachment html.
vendidero · Oct 28, 2024 · 77da694 · 77da694
1 parent e1dae57
commit 77da694
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/includes/abstracts/abstract-wc-gzd-product.php b/includes/abstracts/abstract-wc-gzd-product.php
@@ -386,8 +386,12 @@ public function get_safety_attachment_filename( $id, $context = 'view' ) {
 	}
 
 	public function get_safety_attachment_title( $id, $context = 'view' ) {
-		if ( $file = $this->get_safety_attachment( $id, $context ) ) {
-			return get_the_title( $id );
+		if ( $this->get_safety_attachment( $id, $context ) ) {
+			if ( $caption = wp_get_attachment_caption( $id ) ) {
+				return $caption;
+			} else {
+				return get_the_title( $id );
+			}
 		}
 
 		return false;

diff --git a/includes/class-wc-gzd-manufacturer.php b/includes/class-wc-gzd-manufacturer.php
@@ -67,6 +67,7 @@ protected function format_address( $formatted_address ) {
 
 		// Add html breaks.
 		$formatted_address = implode( '<br/>', $formatted_address );
+		$formatted_address = make_clickable( $formatted_address );
 
 		return $formatted_address;
 	}