Fixes for wasm

akirk · akirk · commit ffd3feaf0035 · 2023-04-12T10:43:41.000+02:00
diff --git a/gp-includes/inline-translation.php b/gp-includes/inline-translation.php
@@ -104,7 +104,6 @@ public function __construct() {
 		add_action( 'ngettext', array( $this, 'ntranslate' ), 10, 5 );
 		add_action( 'ngettext_with_context', array( $this, 'ntranslate_with_context' ), 10, 6 );
 		add_action( 'wp_footer', array( $this, 'load_translator' ), 1000 );
-		add_action( 'gp_footer', array( $this, 'load_translator' ), 1000 );
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 
 		add_action( 'admin_footer', array( $this, 'load_admin_translator' ), 1000 );
@@ -421,7 +420,7 @@ private function get_translation( $projects, $translation_sets, $original, $cont
 					)
 				);
 
-				if ( $translation !== $entry->singular ) {
+				if ( $translation !== $entry->singular && isset( $translation_sets[ $project->id ] ) && is_object( $translation_sets[ $project->id ] ) ) {
 					$translation_record = GP::$translation->create(
 						array(
 							'original_id'        => $original_record->id,
@@ -537,8 +536,9 @@ public function load_translator( $locale_code = null ) {
 				<input id="gp-inline-search" type="text" placeholder="<?php esc_attr_e( 'Search string', 'GlotPress' ); ?>"/>
 				<ul>
 				<?php
+
 				foreach ( $this->get_translations( GP_Locales::by_field( 'wp_locale', $locale_code ) ) as $translation ) {
-					if ( is_array( $translation ) ) {
+					if ( 1 * 1 || is_array( $translation ) ) {
 						continue;
 					}
 					echo '<li>';
diff --git a/gp-includes/rest-api.php b/gp-includes/rest-api.php
@@ -245,52 +245,6 @@ public function save_translation( \WP_REST_Request $request ) {
 		return $output;
 	}
 
-	/**
-	 * A slightly modified version og GP_Original->by_project_id_and_entry without the BINARY search keyword
-	 * to make sure the index on the gp_originals table is used
-	 *
-	 * @param      int    $project_id  The project id.
-	 * @param      object $entry       The entry.
-	 * @param      string $status      The status.
-	 *
-	 * @return     array|null  The original entry.
-	 */
-	private function by_project_id_and_entry( $project_id, $entry, $status = '+active' ) {
-		global $wpdb;
-
-		$entry->plural  = isset( $entry->plural ) ? $entry->plural : null;
-		$entry->context = isset( $entry->context ) ? $entry->context : null;
-
-		$where = array();
-
-		$where[] = is_null( $entry->context ) ? '(context IS NULL OR %s IS NULL)' : 'context = %s';
-		$where[] = 'singular = %s';
-		$where[] = is_null( $entry->plural ) ? '(plural IS NULL OR %s IS NULL)' : 'plural = %s';
-		$where[] = 'project_id = %d';
-		$where[] = $wpdb->prepare( 'status = %s', $status );
-
-		$where = implode( ' AND ', $where );
-
-		$query  = "SELECT * FROM $wpdb->gp_originals WHERE $where";
-		$result = GP::$original->one( $query, $entry->context, $entry->singular, $entry->plural, $project_id );
-		if ( ! $result ) {
-			return null;
-		}
-		// We want case sensitive matching but this can't be done with MySQL while continuing to use the index therefore we do an additional check here.
-		if ( $result->singular === $entry->singular ) {
-			return $result;
-		}
-
-		// We then get the whole result set here and check each entry manually.
-		$results = GP::$original->many( $query . ' AND id != %d', $entry->context, $entry->singular, $entry->plural, $project_id, $result->id );
-		foreach ( $results as $result ) {
-			if ( $result->singular === $entry->singular ) {
-				return $result;
-			}
-		}
-
-		return null;
-	}
 	/**
 	 * Gets translations by title.
 	 *
@@ -379,7 +333,7 @@ public function get_translations_by_originals( \WP_REST_Request $request ) {
 				$checked_originals[ $key ] = true;
 
 				foreach ( $translation_sets[ $text_domain ] as $project_id => $translation_set ) {
-					$original_record = $this->by_project_id_and_entry( $project_id, $original );
+					$original_record = GP_Original::by_project_id_and_entry( $project_id, $original );
 					if ( ! $original_record ) {
 						continue;
 					}
