Merge branch 'master' into wpml-slug-translation-fix

Author: Frederic Fauvel

CPTP/Module/Admin.php

@@ -147,6 +147,10 @@ public function setting_structure_callback_function( $option ) {
 			$disabled = true;
 		}
 
+		if ( isset( $pt_object->cptp ) && ! empty( $pt_object->cptp['permalink_structure'] ) ) {
+			$disabled = true;
+		}
+
 		if ( ! $value ) {
 			$value = CPTP_DEFAULT_PERMALINK;
 		}
@@ -159,7 +163,10 @@ public function setting_structure_callback_function( $option ) {
 		?>
 		<p>
 			<code><?php echo esc_html( home_url() . ( $slug ? '/' : '' ) . $slug ); ?></code>
-			<input name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ); ?>" type="text" class="regular-text code " value="<?php echo esc_attr( $value ); ?>" <?php disabled( $disabled, true, true ); ?> />
+			<input
+				name="<?php echo esc_attr( $name ); ?>" id="<?php echo esc_attr( $name ); ?>" type="text"
+				class="regular-text code "
+				value="<?php echo esc_attr( $value ); ?>" <?php disabled( $disabled, true, true ); ?> />
 		</p>
 		<p>has_archive: <code><?php echo esc_html( $pt_object->has_archive ? 'true' : 'false' ); ?></code> / with_front:
 			<code><?php echo esc_html( $pt_object->rewrite['with_front'] ? 'true' : 'false' ); ?></code></p>

CPTP/Module/GetArchives.php

@@ -149,6 +149,8 @@ public function get_archives_link( $html ) {
 				$link_dir  = $post_type->rewrite['slug'] . '/' . $c['name'] . '/' . $c['termslug'];
 			}
 
+			$ret_link = str_replace( '%link_dir%/date/', '%link_dir%/', $ret_link );
+
 			if ( ! strstr( $html, '/date/' ) ) {
 				$link_dir = $link_dir . CPTP_Util::get_date_front( $post_type );
 			}

CPTP/Util.php

@@ -186,7 +186,7 @@ public static function get_permalink_structure( $post_type ) {
 		}
 
 		if ( ! empty( $post_type->cptp ) && ! empty( $post_type->cptp['permalink_structure'] ) ) {
-			$structure = $post_type->cptp->permalink_structure;
+			$structure = $post_type->cptp['permalink_structure'];
 		} elseif ( ! empty( $post_type->cptp_permalink_structure ) ) {
 			$structure = $post_type->cptp_permalink_structure;
 		} else {

README.md

@@ -8,19 +8,18 @@ Tested up to:      5.6
 Requires PHP:      5.6  
 License:           GPLv2 or Later  
 License URI:       http://www.gnu.org/licenses/gpl-2.0.txt  
-Stable tag:        3.4.2
+Stable tag:        3.4.3
 
 
 Edit the permalink of custom post type.
 
 <!-- only:github/ -->
-[![Latest Stable Version](https://poser.pugx.org/torounit/custom-post-type-permalinks/v/stable)](https://packagist.org/packages/torounit/custom-post-type-permalinks)
-[![License](https://poser.pugx.org/torounit/custom-post-type-permalinks/license)](https://packagist.org/packages/torounit/custom-post-type-permalinks)
-[![Downloads](https://img.shields.io/wordpress/plugin/dt/custom-post-type-permalinks.svg)](https://wordpress.org/plugins/custom-post-type-permalinks/)
-[![Tested up](https://img.shields.io/wordpress/v/custom-post-type-permalinks.svg)](https://wordpress.org/plugins/custom-post-type-permalinks/)
-[![wp.org rating](https://img.shields.io/wordpress/plugin/r/custom-post-type-permalinks.svg)](https://wordpress.org/plugins/custom-post-type-permalinks/)
-[![Build Status](https://travis-ci.org/torounit/custom-post-type-permalinks.svg)](https://travis-ci.org/torounit/custom-post-type-permalinks)
-[![Donation](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://blockchain.info/ja/address/3HwkojX2pd9wc5kPFdXnDXMTNbgBmPRygX)
+[![Latest Stable Version](https://img.shields.io/wordpress/plugin/v/custom-post-type-permalinks?style=for-the-badge)](https://wordpress.org/plugins/custom-post-type-permalinks/)
+[![License](https://img.shields.io/github/license/torounit/custom-post-type-permalinks?style=for-the-badge)](https://github.com/torounit/custom-post-type-permalinks/blob/master/LICENSE)
+[![Downloads](https://img.shields.io/wordpress/plugin/dt/custom-post-type-permalinks.svg?style=for-the-badge)](https://wordpress.org/plugins/custom-post-type-permalinks/)
+[![Tested up](https://img.shields.io/wordpress/v/custom-post-type-permalinks.svg?style=for-the-badge)](https://wordpress.org/plugins/custom-post-type-permalinks/)
+[![wp.org rating](https://img.shields.io/wordpress/plugin/r/custom-post-type-permalinks.svg?style=for-the-badge)](https://wordpress.org/plugins/custom-post-type-permalinks/)
+[![Build Status](https://img.shields.io/github/workflow/status/torounit/custom-post-type-permalinks/Test?style=for-the-badge)](https://github.com/torounit/custom-post-type-permalinks/actions)
 [![](https://ps.w.org/custom-post-type-permalinks/assets/banner-1544x500.png?rev=1044335)](https://wordpress.org/plugins/custom-post-type-permalinks/)
 <!-- /only:github -->
 
@@ -96,6 +95,9 @@ That's it. You can access the permalinks setting by going to *Settings -> Permal
 
 ## Changelog
 
+### 3.4.3
+* Fix archive link bug fix.
+
 ### 3.4.2
 * Tested WP 5.6.
 

custom-post-type-permalinks.php

@@ -5,13 +5,13 @@
  * Description:  Add post archives of custom post type and customizable permalinks.
  * Author: Toro_Unit
  * Author URI: https://torounit.com/
- * Version: 3.4.2
+ * Version: 3.4.3
  * Text Domain: custom-post-type-permalinks
  * License: GPL2 or later
  * Domain Path: /language/
  *
  * @package Custom_Post_Type_Permalinks
- * @version 3.4.2
+ * @version 3.4.3
  */
 
 define( 'CPTP_PLUGIN_FILE', __FILE__ );

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "custom-post-type-permalinks",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "description": "Custom Post Type Permalinks allow you edit the permalink structure of custom post type.",
   "private": true,
   "directories": {