Merge pull request #392 from lloc/fix-double-output

Fix double output

Author: lloc

.distignore

@@ -30,4 +30,5 @@ phpdoc.xml
 phpstan.neon
 phpunit.xml
 playwright.config.ts
-setup.sh
+setup.sh
+multisite-language-switcher.zip

includes/MslsPostTag.php

@@ -17,7 +17,8 @@
  */
 class MslsPostTag extends MslsMain {
 
-	protected int $excution_counter = 0;
+	const EDIT_ACTION = 'msls_post_tag_edit_input';
+	const ADD_ACTION  = 'msls_post_tag_add_input';
 
 	/**
 	 * Suggest
@@ -97,6 +98,10 @@ public static function init(): void {
 	 * @param string $taxonomy
 	 */
 	public function add_input( string $taxonomy ): void {
+		if ( did_action( self::ADD_ACTION ) ) {
+			return;
+		}
+
 		$title_format = '<h3>%s</h3>
 			<input type="hidden" name="msls_post_type" id="msls_post_type" value="%s"/>
 			<input type="hidden" name="msls_action" id="msls_action" value="suggest_terms"/>';
@@ -108,6 +113,8 @@ public function add_input( string $taxonomy ): void {
 		echo '<div class="form-field">';
 		$this->the_input( null, $title_format, $item_format );
 		echo '</div>';
+
+		do_action( self::ADD_ACTION, $taxonomy );
 	}
 
 	/**
@@ -117,6 +124,10 @@ public function add_input( string $taxonomy ): void {
 	 * @param string   $taxonomy
 	 */
 	public function edit_input( \WP_Term $tag, string $taxonomy ): void {
+		if ( did_action( self::EDIT_ACTION ) ) {
+			return;
+		}
+
 		$title_format = '<tr>
 			<th colspan="2">
 			<strong>%s</strong>
@@ -136,6 +147,8 @@ public function edit_input( \WP_Term $tag, string $taxonomy ): void {
 			</tr>';
 
 		$this->the_input( $tag, $title_format, $item_format );
+
+		do_action( self::EDIT_ACTION, $tag, $taxonomy );
 	}
 
 	/**
@@ -150,10 +163,6 @@ public function edit_input( \WP_Term $tag, string $taxonomy ): void {
 	 * @return boolean
 	 */
 	public function the_input( ?\WP_Term $tag, string $title_format, string $item_format ): bool {
-		if ( $this->already_executed() ) {
-			return false;
-		}
-
 		$blogs = $this->collection->get();
 		if ( $blogs ) {
 			$term_id = $tag->term_id ?? 0;
@@ -261,14 +270,4 @@ protected function get_select_title(): string {
 			__( 'Multisite Language Switcher', 'multisite-language-switcher' )
 		);
 	}
-
-	protected function already_executed(): bool {
-		if ( $this->excution_counter > 0 ) {
-			return true;
-		}
-
-		++$this->excution_counter;
-
-		return false;
-	}
 }

includes/MslsPostTagClassic.php

@@ -11,12 +11,19 @@
  */
 class MslsPostTagClassic extends MslsPostTag {
 
+	const EDIT_ACTION = 'msls_post_tag_classic_edit_input';
+	const ADD_ACTION  = 'msls_post_tag_classic_add_input';
+
 	/**
 	 * Add the input fields to the add-screen of the taxonomies
 	 *
 	 * @param string $taxonomy
 	 */
 	public function add_input( string $taxonomy ): void {
+		if ( did_action( self::ADD_ACTION ) ) {
+			return;
+		}
+
 		$title_format = '<h3>%s</h3>';
 
 		$item_format = '<label for="msls_input_%1$s">%2$s</label>
@@ -28,6 +35,8 @@ public function add_input( string $taxonomy ): void {
 		echo '<div class="form-field">';
 		$this->the_input( null, $title_format, $item_format );
 		echo '</div>';
+
+		do_action( self::ADD_ACTION, $taxonomy );
 	}
 
 	/**
@@ -37,6 +46,10 @@ public function add_input( string $taxonomy ): void {
 	 * @param string   $taxonomy
 	 */
 	public function edit_input( \WP_Term $tag, string $taxonomy ): void {
+		if ( did_action( self::EDIT_ACTION ) ) {
+			return;
+		}
+
 		$title_format = '<tr>
 			<th colspan="2">
 			<strong>%s</strong>
@@ -54,6 +67,8 @@ public function edit_input( \WP_Term $tag, string $taxonomy ): void {
 			</tr>';
 
 		$this->the_input( $tag, $title_format, $item_format );
+
+		do_action( self::EDIT_ACTION, $tag, $taxonomy );
 	}
 
 	/**
@@ -67,10 +82,6 @@ public function edit_input( \WP_Term $tag, string $taxonomy ): void {
 	 * @return boolean
 	 */
 	public function the_input( ?\WP_Term $tag, string $title_format, string $item_format ): bool {
-		if ( $this->already_executed() ) {
-			return false;
-		}
-
 		$blogs = $this->collection->get();
 		if ( ! empty( $blogs ) ) {
 			$term_id = $tag->term_id ?? 0;