DC patch v.2.4.2

assets/scripts/translator.js

@@ -51,8 +51,8 @@ var wpm_translator = {
 
  blocks.forEach(function(block, index) {
  if (index % 2 === 1) {
- lang = block;
- } else if (!!results[lang]) {
+ lang = block.replace(/\[|\]|:/g,'');
+ } else if (lang in results) {
  results[lang] += block.trim();
  }
  });

configs/plugins/elementor.json

@@ -0,0 +1,7 @@
+{
+ "post_fields": {
+ "_elementor_data": {},
+ "_elementor_css": {},
+ "_elementor_controls_usage": {}
+ }
+}

configs/plugins/seo-by-rank-math.json

@@ -10,8 +10,24 @@
  "rank_math_rich_snippet": {},
  "rank_math_facebook_title": {},
  "rank_math_facebook_description": {},
+ "rank_math_snippet_name": {},
+ "rank_math_snippet_desc": {},
+ "rank_math_snippet_article_type": {},
+ "rank_math_facebook_enable_image_overlay": {},
+ "rank_math_facebook_image_id": {},
+ "rank_math_facebook_image": {},
+ "rank_math_twitter_use_facebook": {},
+ "rank_math_twitter_card_type": {},
  "rank_math_twitter_title": {},
- "rank_math_twitter_description": {}
+ "rank_math_twitter_description": {},
+ "rank_math_twitter_enable_image_overlay": {},
+ "rank_math_twitter_image_id": {},
+ "rank_math_twitter_image": {},
+ "rank_math_twitter_image_overlay": {},
+ "rank_math_canonical_url": {},
+ "rank_math_breadcrumb_title": {},
+ "redirection_header_code": {},
+ "redirection_url_to": {}
  },
  "admin_pages": [
  "toplevel_page_rank-math"
@@ -27,7 +43,7 @@
  "date_archive_title" : {},
  "date_archive_description" : {},
  "search_title" : {},
- "404_title" : {},
+ "404_title" : {}
  },
  "rank-math-options-general": {
  "breadcrumbs_home_label" : {},

configs/plugins/woocommerce.json

@@ -1,5 +1,6 @@
 {
  "post_types": {
+ "shop_order": {},
  "product": {},
  "product_variation": {},
  "shop_coupon": {
@@ -111,6 +112,14 @@
  }
  },
  "admin_html_tags": {
+ "woocommerce_page_wc-settings": {
+ "option": [
+ "#woocommerce_cart_page_id",
+ "#woocommerce_checkout_page_id",
+ "#woocommerce_myaccount_page_id",
+ "#woocommerce_terms_page_id"
+ ]
+ },
  "product_page_product_attributes": {
  "value": [
  "#attribute_label"

includes/abstracts/abstract-wpm-object.php

@@ -293,6 +293,129 @@ public function update_meta_field( $check, $object_id, $meta_key, $meta_value, $
  return true;
  }
 
+ /**
+ * Save meta by meta_id with translations (since WP 5.0.0)
+ *
+ * @param null|bool $check Whether to allow updating metadata for the given type.
+ * @param int $meta_id Meta ID.
+ * @param mixed $meta_value Meta value. Must be serializable if non-scalar.
+ * @param string|bool $meta_key New meta key or false if it mustn't be changed.
+ *
+ * @return bool|null Returning a non-null value will short-circuit the WP update function
+ */
+ public function update_meta_field_by_mid( $check, $meta_id, $meta_value, $meta_key ) {
+ global $wpdb;
+
+ $meta_type = $this->object_type;
+
+ // Fetch the meta and go on if it's found.
+ $meta = get_metadata_by_mid( $meta_type, $meta_id );
+ if ( ! $meta ) {
+ return false;
+ }
+
+ $column = sanitize_key( $this->object_type . '_id' );
+ $original_key = $meta->meta_key;
+ $object_id = $meta->{$column};
+
+ switch ( $this->object_type ) {
+
+ case 'post':
+ if ( null === wpm_get_post_config( get_post_type( $object_id ) ) ) {
+ return $check;
+ }
+
+ break;
+
+ case 'term':
+ $term = get_term( $object_id );
+ if ( ! $term || null === wpm_get_taxonomy_config( $term->taxonomy ) ) {
+ return $check;
+ }
+ }
+
+ $config = wpm_get_config();
+ $object_fields_config = apply_filters( "wpm_{$this->object_type}_fields_config", $config[ "{$this->object_type}_fields" ] );
+
+ if ( ! isset( $object_fields_config[ $meta_key ] ) ) {
+ return $check;
+ }
+
+ $meta_config = apply_filters( "wpm_{$meta_key}_meta_config", $object_fields_config[ $meta_key ], $meta_value, $object_id );
+ $meta_config = apply_filters( "wpm_{$this->object_type}_meta_{$meta_key}_config", $meta_config, $meta_value, $object_id );
+
+ $table = $wpdb->{$this->object_table};
+ $id_column = 'user' === $this->object_type ? 'umeta_id' : 'meta_id';
+ $meta_value = apply_filters( 'wpm_update_meta_value', $meta_value, $meta_key );
+ $meta_value = apply_filters( "wpm_update_{$meta_key}_meta_value", $meta_value );
+ $meta_value = apply_filters( "wpm_update_{$this->object_type}_meta_{$meta_key}_value", $meta_value );
+
+ if ( null === $meta_config ) {
+ return $check;
+ }
+
+ // If a new meta_key (last parameter) was specified, change the meta key,
+ // otherwise use the original key in the update statement.
+ if ( false === $meta_key ) {
+ $meta_key = $original_key;
+ } elseif ( ! is_string( $meta_key ) ) {
+ return false;
+ }
+
+ $meta_subtype = get_object_subtype( $meta_type, $object_id );
+
+ // Sanitize the meta.
+ $_meta_value = $meta_value;
+
+ if ( ! wpm_is_ml_value( $meta_value ) ) {
+ $old_value = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM {$wpdb->{$this->object_table}} WHERE meta_key = %s AND {$column} = %d LIMIT 1;", $meta_key, $object_id ) );
+ $old_value = maybe_unserialize( $old_value );
+ $old_value = apply_filters( "wpm_filter_old_{$meta_key}_meta_value", $old_value, $meta_value, $meta_config );
+ $meta_value = wpm_set_new_value( $old_value, $meta_value, $meta_config );
+ $meta_value = apply_filters( "wpm_filter_new_{$meta_key}_meta_value", $meta_value, $old_value, $meta_config );
+ }
+
+ $meta_value = sanitize_meta( $meta_key, $meta_value, $meta_type, $meta_subtype );
+ $meta_value = maybe_serialize( $meta_value );
+
+ // Format the data query arguments.
+ $data = array(
+ 'meta_key' => $meta_key,
+ 'meta_value' => $meta_value,
+ );
+
+ // Format the where query arguments.
+ $where = array();
+ $where[ $id_column ] = $meta_id;
+
+ /** This action is documented in wp-includes/meta.php */
+ do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+
+ if ( 'post' === $meta_type ) {
+ /** This action is documented in wp-includes/meta.php */
+ do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+ }
+
+ // Run the update query, all fields in $data are %s, $where is a %d.
+ $result = $wpdb->update( $table, $data, $where, '%s', '%d' );
+ if ( ! $result ) {
+ return false;
+ }
+
+ // Clear the caches.
+ wp_cache_delete( $object_id, $meta_type . '_meta' );
+
+ /** This action is documented in wp-includes/meta.php */
+ do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_value );
+
+ if ( 'post' === $meta_type ) {
+ /** This action is documented in wp-includes/meta.php */
+ do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
+ }
+
+ return true;
+ }
+
  /**
  * Add new meta for translation
  *

includes/admin/class-wpm-admin-assets.php

@@ -68,7 +68,7 @@ public function admin_scripts() {
  'language' => wpm_get_language(),
  'show_untranslated_strings' => get_option( 'wpm_show_untranslated_strings', 'yes' ),
  );
- wp_localize_script( 'wpm_translator', 'wpm_translator_params', $translator_params );
+ wp_add_inline_script( 'wpm_translator', 'const wpm_translator_params = '.json_encode($translator_params), 'before' );
  wp_register_script( 'wpm_additional_settings', wpm_asset_path( 'scripts/additional-settings' . $suffix . '.js' ), array( 'jquery' ), WPM_VERSION );
 
  $script = "

includes/admin/class-wpm-admin-settings.php

@@ -122,9 +122,10 @@ public static function output() {
 
  wp_enqueue_script( 'wpm_settings', wpm_asset_path( 'scripts/settings' . $suffix . '.js' ), array( 'jquery' ), wpm()->version, true );
 
- wp_localize_script( 'wpm_settings', 'wpm_settings_params', array(
- 'nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'wp-multilang' ),
- ) );
+ $main_params = array(
+ 'nav_warning' => __( 'The changes you made will be lost if you navigate away from this page.', 'wp-multilang' )
+ );
+ wp_add_inline_script( 'wpm_settings', 'const wpm_settings_params = '.json_encode($main_params), 'before' );
 
  // Get tabs for the settings page
  $tabs = apply_filters( 'wpm_settings_tabs_array', array() );

includes/admin/settings/class-wpm-settings-additional.php

@@ -76,7 +76,7 @@ public function output() {
  'qtx_import_nonce' => wp_create_nonce( 'qtx-import' ),
  'confirm_question' => __( 'Are you sure you want to delete this localization?', 'wp-multilang' ),
  );
- wp_localize_script( 'wpm_additional_settings', 'wpm_additional_settings_params', $main_params );
+ wp_add_inline_script( 'wpm_additional_settings', 'const wpm_additional_settings_params = '.json_encode($main_params), 'before' );
  wp_enqueue_script( 'wpm_additional_settings' );
 
  parent::output();

includes/admin/settings/class-wpm-settings-languages.php

@@ -69,7 +69,7 @@ public function get_languages( $value ) {
  'delete_lang_nonce' => wp_create_nonce( 'delete-lang' ),
  'confirm_question' => __( 'Are you sure you want to delete this language?', 'wp-multilang' ),
  );
- wp_localize_script( 'wpm_languages', 'wpm_languages_params', $main_params );
+ wp_add_inline_script( 'wpm_languages', 'const wpm_languages_params = '.json_encode($main_params), 'before' );
 
  wp_enqueue_script( 'wpm_languages' );
  wp_enqueue_style( 'select2' );

includes/class-wpm-frontend-scripts.php

@@ -166,7 +166,7 @@ private static function localize_script( $handle ) {
  if ( ! in_array( $handle, self::$wp_localize_scripts, true ) && wp_script_is( $handle ) && ( $data = self::get_script_data( $handle ) ) ) {
  $name = str_replace( '-', '_', $handle ) . '_params';
  self::$wp_localize_scripts[] = $handle;
- wp_localize_script( $handle, $name, apply_filters( $name, $data ) );
+ wp_add_inline_script( $handle, 'const {$name} = '.json_encode( apply_filters( $name, $data ) ), 'before' );
  }
  }
 

includes/class-wpm-posts.php

@@ -47,6 +47,7 @@ public function __construct() {
  add_action( 'parse_query', array( $this, 'filter_posts_by_language' ) );
  add_filter( "get_{$this->object_type}_metadata", array( $this, 'get_meta_field' ), 5, 3 );
  add_filter( "update_{$this->object_type}_metadata", array( $this, 'update_meta_field' ), 99, 5 );
+ add_filter( "update_{$this->object_type}_metadata_by_mid", array( $this, 'update_meta_field_by_mid' ), 99, 4 );
  add_filter( "add_{$this->object_type}_metadata", array( $this, 'add_meta_field' ), 99, 5 );
  add_action( "delete_{$this->object_type}_metadata", array( $this, 'delete_meta_field' ), 99, 3 );
  add_action( 'wp', array( $this, 'translate_queried_object' ), 5 );
@@ -179,6 +180,14 @@ public function save_post( $data, $postarr ) {
 
  if ( $post_id ) {
  $old_value = get_post_field( $key, $post_id, 'edit' );
+
+ // Override "(Auto Draft)" new post default title with empty string.
+ if ( 'post_title' === $key ) {
+ $old_post_status = get_post_field( 'post_status', $post_id, 'edit' );
+ if ( 'auto-draft' === $old_post_status ) {
+ $old_value = '';
+ }
+ }
  } else {
  $old_value = '';
  }

includes/class-wpm-setup.php

@@ -531,6 +531,7 @@ public function load_integrations() {
  'woocommerce' => __NAMESPACE__ . '\Integrations\WPM_WooCommerce',
  'wordpress-seo' => __NAMESPACE__ . '\Integrations\WPM_Yoast_Seo',
  'seo-by-rank-math' => __NAMESPACE__ . '\Integrations\WPM_Rank_Math',
+ 'elementor' => __NAMESPACE__ . '\Integrations\WPM_Elementor',
  ) );
 
  $active_plugins = wp_cache_get( 'active_plugins', 'wpm' );

includes/integrations/class-wpm-acf.php

@@ -16,7 +16,6 @@
  * @author Valentyn Riaboshtan
  */
 class WPM_Acf {
-
  /**
  * WPM_Acf constructor.
  */
@@ -31,12 +30,13 @@ public function __construct() {
  add_filter( 'wpm_acf_field_text_config', array( $this, 'add_text_field_config' ) );
  add_filter( 'wpm_acf_field_textarea_config', array( $this, 'add_text_field_config' ) );
  add_filter( 'wpm_acf_field_wysiwyg_config', array( $this, 'add_text_field_config' ) );
+ add_filter( 'wpm_acf_field_image_config', array( $this, 'add_image_field_config' ) );
  add_filter( 'wpm_acf_text_config', '__return_empty_array' );
  add_filter( 'wpm_acf_textarea_config', '__return_empty_array' );
  add_filter( 'wpm_acf_wysiwyg_config', '__return_empty_array' );
+ add_filter( 'wpm_acf_image_config', '__return_empty_array' );
  }
 
-
  /**
  * Add config for 'acf' post types
  *
@@ -116,12 +116,15 @@ public function add_text_field_config( $config ) {
  *
  * @return array|bool|string
  */
- public function update_value( $value, $post_id, $field ) {
-
+ public function update_value( $value, $post_id, $field ) { 
  if ( wpm_is_ml_value( $value ) ) {
  return $value;
  }
 
+ if ( ( strpos($post_id, 'block') !== false ) && ( $field['type'] == 'wysiwyg' || $field['type'] == 'text' || $field['type'] == 'textarea' ) ) {
+ return $value;
+ }
+
  $info = acf_get_post_id_info( $post_id );
 
  switch ( $info['type'] ) {
@@ -144,6 +147,7 @@ public function update_value( $value, $post_id, $field ) {
  $acf_field_config = apply_filters( "wpm_acf_{$info['type']}_config", null, $value, $post_id, $field );
  $acf_field_config = apply_filters( "wpm_acf_{$field['type']}_config", $acf_field_config, $value, $post_id, $field );
  $acf_field_config = apply_filters( "wpm_acf_name_{$field['name']}_config", $acf_field_config, $value, $post_id, $field );
+ $acf_field_config = apply_filters( "wpm_acf_name_{$field['_name']}_config", $acf_field_config, $value, $post_id, $field );
 
  if ( null === $acf_field_config ) {
  return $value;

includes/integrations/class-wpm-cf7.php

@@ -22,7 +22,9 @@ class WPM_CF7 {
  */
  public function __construct() {
  add_filter( 'wpcf7_special_mail_tags', array( $this, 'add_language_tag' ), 10, 2 );
+ add_filter( 'wpcf7_special_mail_tags', array( $this, 'translate_post_title' ), 11, 2 );
  add_filter( 'wpcf7_form_hidden_fields', array( $this, 'add_lang_field' ) );
+ add_action( 'wpcf7_contact_form', array( $this, 'edit_form_translate_shortcode_title_attr' ), 10, 1 );
  }
 
  public function add_language_tag( $output, $name ) {
@@ -35,6 +37,21 @@ public function add_language_tag( $output, $name ) {
  return $output;
  }
 
+ /**
+ * Translate post title
+ *
+ * @param $output string
+ * @param $name string
+ *
+ * @return string
+ */
+ public function translate_post_title( $output, $name ) {
+ if ( '_post_name' == $name ) {
+ return wpm_translate_string( $output);
+ }
+
+ return $output;
+ }
 
  /**
  * Add current user language hidden field
@@ -48,4 +65,13 @@ public function add_lang_field( $fields ) {
 
  return $fields;
  }
+
+ /**
+ * Fix translation of the "title" attribute in the shortcode for copying, on the form edit page
+ *
+ * @param $wpcf7 current Contacts Form 7 instance
+ */
+ public function edit_form_translate_shortcode_title_attr( $wpcf7 ) {
+ $wpcf7->set_title( wpm_translate_string( $wpcf7->title() ) );
+ }
 }