Merge pull request #42 from pattyok/modal

updating for empty permalink
pattyok · Aug 4, 2024 · 85cb786 · 85cb786
2 parents 27f26a4 + f09a2d0
commit 85cb786
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/carkeek-blocks.php b/carkeek-blocks.php
@@ -8,7 +8,7 @@
  * Primary Branch: main
  * Description: Series of blocks designed to work with this site's custom Theme
  * Author: Patty O'Hara
- * Version: 3.2.30
+ * Version: 3.2.31
  * Author URI https://carkeekstudios.com/
  * Text Domain: carkeek-blocks
  */

diff --git a/readme.txt b/readme.txt
@@ -44,6 +44,9 @@ directory take precedence. For example, `/assets/screenshot-1.png` would win ove
 2. This is the second screen shot
 
 == Changelog ==
+= 3.2.31 =
+* Release 3.2.31 = 08/04/24
+	* Made an update to the template that it wont link the title and image if the permalink is empty. (Used on PIP where we are using a custom external link for news.)
 = 3.2.26 =
 * Release 3.2.26 = 06/18/24
 	* Updated the Modal Block/Carkeek Archive Modal to use Codyhouse components

diff --git a/templates/custom-archive/default_item.php b/templates/custom-archive/default_item.php
@@ -40,10 +40,11 @@
 }
 $link_start = '';
 $link_end   = '';
-if ( isset( $data->noLink ) && true == $data->noLink ) {
+$permalink        = apply_filters( 'ck_custom_archive_' . $data->postTypeSelected . '__link', get_permalink(), $post->ID, $data );
+if ( isset( $data->noLink ) && true == $data->noLink || empty( $permalink ) ) {
 	$link_title = get_the_title();
 } else {
-	$permalink        = apply_filters( 'ck_custom_archive_' . $data->postTypeSelected . '__link', get_permalink(), $post->ID, $data );
+
 	$permalink_target = isset( $data->newWindow ) && true == $data->newWindow ? '_blank' : '_self';
 	$permalink_target = apply_filters( 'ck_custom_archive_' . $data->postTypeSelected . '__link_target', $permalink_target, $data );
 	if ( !isset( $data->wholeLink ) || false == $data->wholeLink ) {
@@ -97,15 +98,15 @@
 	$image_style = isset( $data->imageOrientation ) ? 'layout-' . $data->imageOrientation : 'layout-landscape';
 
 ?>
-	<?php if ( false == $data->noLink && false == $data->wholeLink ) { ?>
+	<?php if ( false == $data->noLink && false == $data->wholeLink && !empty($permalink)) { ?>
 		<a class="ck-custom-archive-image-link <?php echo esc_attr( $image_style ); ?>" aria-hidden="true" tabindex="-1" href="<?php echo esc_url( $permalink ); ?>" target="<?php echo esc_attr( $permalink_target ); ?>">
 	<?php } else { ?>
 		<div class="ck-custom-archive-image-link <?php echo esc_attr( $image_style ); ?>">
 	<?php } ?>
 
 		<?php echo wp_kses_post( $featured_image ); ?>
 
-	<?php if ( false == $data->noLink && false == $data->wholeLink) { ?>
+	<?php if ( false == $data->noLink && false == $data->wholeLink && !empty($permalink)) { ?>
 		</a>
 		<?php } else { ?>
 		</div>