| @@ -22,14 +22,10 @@ | ||
| 22 | 22 | $this->taxonomies = new PLL_Sync_Tax( $polylang ); |
| 23 | 23 | $this->post_metas = new PLL_Sync_Post_Metas( $polylang ); |
| 24 | 24 | $this->term_metas = new PLL_Sync_Term_Metas( $polylang ); |
| 25 | 25 | |
| 26 | - add_filter( 'wp_insert_post_parent', array( $this, 'can_sync_post_parent' ), 10, 3 ); | |
| 27 | - add_filter( 'wp_insert_post_data', array( $this, 'can_sync_post_data' ), 10, 2 ); | |
| 28 | - | |
| 29 | 26 | add_action( 'pll_save_post', array( $this, 'pll_save_post' ), 10, 3 ); |
| 30 | - add_action( 'created_term', array( $this, 'sync_term_parent' ), 10, 3 ); | |
| 31 | - add_action( 'edited_term', array( $this, 'sync_term_parent' ), 10, 3 ); | |
| 27 | + add_action( 'pll_save_term', array( $this, 'sync_term_parent' ), 10, 3 ); | |
| 32 | 28 | |
| 33 | 29 | add_action( 'pll_duplicate_term', array( $this->term_metas, 'copy' ), 10, 3 ); |
| 34 | 30 | |
| 35 | 31 | if ( $this->options['media_support'] ) { |
| @@ -70,53 +66,8 @@ | ||
| 70 | 66 | return $postarr; |
| 71 | 67 | } |
| 72 | 68 | |
| 73 | 69 | /** |
| 74 | - * Prevents synchronized post parent modification if the current user hasn't enough rights | |
| 75 | - * | |
| 76 | - * @since 2.6 | |
| 77 | - * | |
| 78 | - * @param int $post_parent Post parent ID | |
| 79 | - * @param int $post_id Post ID, unused | |
| 80 | - * @param array $postarr Array of parsed post data | |
| 81 | - * @return int | |
| 82 | - */ | |
| 83 | - public function can_sync_post_parent( $post_parent, $post_id, $postarr ) { | |
| 84 | - if ( ! empty( $postarr['ID'] ) && ! $this->model->post->current_user_can_synchronize( $postarr['ID'] ) ) { | |
| 85 | - $tr_ids = $this->model->post->get_translations( $postarr['ID'] ); | |
| 86 | - foreach ( $tr_ids as $tr_id ) { | |
| 87 | - if ( $tr_id !== $postarr['ID'] && $post = get_post( $tr_id ) ) { | |
| 88 | - $post_parent = $post->post_parent; | |
| 89 | - break; | |
| 90 | - } | |
| 91 | - } | |
| 92 | - } | |
| 93 | - return $post_parent; | |
| 94 | - } | |
| 95 | - | |
| 96 | - /** | |
| 97 | - * Prevents synchronized post data modification if the current user hasn't enough rights | |
| 98 | - * | |
| 99 | - * @since 2.6 | |
| 100 | - * | |
| 101 | - * @param array $data An array of slashed post data. | |
| 102 | - * @param array $postarr An array of sanitized, but otherwise unmodified post data. | |
| 103 | - * @return array | |
| 104 | - */ | |
| 105 | - public function can_sync_post_data( $data, $postarr ) { | |
| 106 | - if ( ! empty( $postarr['ID'] ) && ! $this->model->post->current_user_can_synchronize( $postarr['ID'] ) ) { | |
| 107 | - foreach ( $this->model->post->get_translations( $postarr['ID'] ) as $tr_id ) { | |
| 108 | - if ( $tr_id !== $postarr['ID'] && $post = get_post( $tr_id ) ) { | |
| 109 | - $to_sync = $this->get_fields_to_sync( $post ); | |
| 110 | - $data = array_merge( $data, $to_sync ); | |
| 111 | - break; | |
| 112 | - } | |
| 113 | - } | |
| 114 | - } | |
| 115 | - return $data; | |
| 116 | - } | |
| 117 | - | |
| 118 | - /** | |
| 119 | 70 | * Synchronizes post fields in translations |
| 120 | 71 | * |
| 121 | 72 | * @since 2.4 |
| 122 | 73 | * |
| @@ -126,35 +77,31 @@ | ||
| 126 | 77 | */ |
| 127 | 78 | public function pll_save_post( $post_id, $post, $translations ) { |
| 128 | 79 | global $wpdb; |
| 129 | 80 | |
| 130 | - if ( $this->model->post->current_user_can_synchronize( $post_id ) ) { | |
| 131 | - $postarr = $this->get_fields_to_sync( $post ); | |
| 81 | + $postarr = $this->get_fields_to_sync( $post ); | |
| 132 | 82 | |
| 133 | - if ( ! empty( $postarr ) ) { | |
| 134 | - foreach ( $translations as $lang => $tr_id ) { | |
| 135 | - if ( ! $tr_id || $tr_id === $post_id ) { | |
| 136 | - continue; | |
| 137 | - } | |
| 83 | + if ( ! empty( $postarr ) ) { | |
| 84 | + foreach ( $translations as $lang => $tr_id ) { | |
| 85 | + if ( ! $tr_id || $tr_id === $post_id ) { | |
| 86 | + continue; | |
| 87 | + } | |
| 138 | 88 | |
| 139 | - $tr_arr = $postarr; | |
| 140 | - unset( $tr_arr['post_parent'] ); | |
| 89 | + $tr_arr = $postarr; | |
| 90 | + unset( $tr_arr['post_parent'] ); | |
| 141 | 91 | |
| 142 | - // Do not udpate the translation parent if the user set a parent with no translation. | |
| 143 | - if ( isset( $postarr['post_parent'] ) ) { | |
| 144 | - $post_parent = $postarr['post_parent'] ? $this->model->post->get_translation( $postarr['post_parent'], $lang ) : 0; | |
| 145 | - if ( ! ( $postarr['post_parent'] && ! $post_parent ) ) { | |
| 146 | - $tr_arr['post_parent'] = $post_parent; | |
| 147 | - } | |
| 92 | + // Do not udpate the translation parent if the user set a parent with no translation | |
| 93 | + if ( isset( $postarr['post_parent'] ) ) { | |
| 94 | + $post_parent = $postarr['post_parent'] ? $this->model->post->get_translation( $postarr['post_parent'], $lang ) : 0; | |
| 95 | + if ( ! ( $postarr['post_parent'] && ! $post_parent ) ) { | |
| 96 | + $tr_arr['post_parent'] = $post_parent; | |
| 148 | 97 | } |
| 98 | + } | |
| 149 | 99 | |
| 150 | - // Update all the rows at once. | |
| 151 | - if ( ! empty( $tr_arr ) ) { | |
| 152 | - // Don't use wp_update_post to avoid infinite loop. | |
| 153 | - $wpdb->update( $wpdb->posts, $tr_arr, array( 'ID' => $tr_id ) ); | |
| 154 | - clean_post_cache( $tr_id ); | |
| 155 | - } | |
| 156 | - } | |
| 100 | + // Update all the row at once | |
| 101 | + // Don't use wp_update_post to avoid infinite loop | |
| 102 | + $wpdb->update( $wpdb->posts, $tr_arr, array( 'ID' => $tr_id ) ); | |
| 103 | + clean_post_cache( $tr_id ); | |
| 157 | 104 | } |
| 158 | 105 | } |
| 159 | 106 | } |
| 160 | 107 | |
| @@ -160,25 +107,25 @@ | ||
| 160 | 107 | |
| 161 | 108 | /** |
| 162 | 109 | * Synchronize term parent in translations |
| 163 | 110 | * Calling clean_term_cache *after* this is mandatory otherwise the $taxonomy_children option is not correctly updated |
| 111 | + * Before WP 3.9 clean_term_cache could be called ( efficiently ) only one time due to static array which prevented to update the option more than once | |
| 112 | + * This is the reason to use the edit_term filter and not edited_term | |
| 164 | 113 | * |
| 165 | 114 | * @since 2.3 |
| 166 | 115 | * |
| 167 | - * @param int $term_id Term id. | |
| 168 | - * @param int $tt_id Term taxonomy id, not used. | |
| 169 | - * @param string $taxonomy Taxonomy name. | |
| 116 | + * @param int $term_id Term id | |
| 117 | + * @param string $taxonomy Taxonomy name | |
| 118 | + * @param array $translations The list of translations term ids | |
| 170 | 119 | */ |
| 171 | - public function sync_term_parent( $term_id, $tt_id, $taxonomy ) { | |
| 120 | + public function sync_term_parent( $term_id, $taxonomy, $translations ) { | |
| 172 | 121 | global $wpdb; |
| 173 | 122 | |
| 174 | 123 | if ( is_taxonomy_hierarchical( $taxonomy ) && $this->model->is_translated_taxonomy( $taxonomy ) ) { |
| 175 | 124 | $term = get_term( $term_id ); |
| 176 | - $translations = $this->model->term->get_translations( $term_id ); | |
| 177 | 125 | |
| 178 | 126 | foreach ( $translations as $lang => $tr_id ) { |
| 179 | - if ( ! empty( $tr_id ) && $tr_id !== $term_id ) { | |
| 180 | - $tr_parent = $this->model->term->get_translation( $term->parent, $lang ); | |
| 127 | + if ( ! empty( $tr_id ) && $tr_id !== $term_id && $tr_parent = $this->model->term->get_translation( $term->parent, $lang ) ) { | |
| 181 | 128 | $wpdb->update( |
| 182 | 129 | $wpdb->term_taxonomy, |
| 183 | 130 | array( 'parent' => isset( $tr_parent ) ? $tr_parent : 0 ), |
| 184 | 131 | array( 'term_taxonomy_id' => get_term( (int) $tr_id, $taxonomy )->term_taxonomy_id ) |
