← All changes | include/crud-posts.php +28 -38 2.7.3 → 2.5 View file →

		@@ -41,12 +41,12 @@
41	41	* @param int $post_id
42	42	*/
43	43	public function set_default_language( $post_id ) {
44	44	if ( ! $this->model->post->get_language( $post_id ) ) {
45		- if ( ! empty( $_GET['new_lang'] ) && $lang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
	45	+ if ( ! empty( $_GET['new_lang'] ) && $lang = $this->model->get_language( $_GET['new_lang'] ) ) {
46	46	// Defined only on admin.
47	47	$this->model->post->set_language( $post_id, $lang );
48		- } elseif ( ! isset( $this->pref_lang ) && ! empty( $_REQUEST['lang'] ) && $lang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
	48	+ } elseif ( ! isset( $this->pref_lang ) && ! empty( $_REQUEST['lang'] ) && $lang = $this->model->get_language( $_REQUEST['lang'] ) ) {
49	49	// Testing $this->pref_lang makes this test pass only on admin.
50	50	$this->model->post->set_language( $post_id, $lang );
51	51	} elseif ( ( $parent_id = wp_get_post_parent_id( $post_id ) ) && $parent_lang = $this->model->post->get_language( $parent_id ) ) {
52	52	$this->model->post->set_language( $post_id, $parent_lang );
		@@ -120,9 +120,8 @@
120	120	}
121	121
122	122	$term_ids = array_combine( $terms, $terms );
123	123	$languages = array_map( array( $this->model->term, 'get_language' ), $term_ids );
124		- $languages = array_filter( $languages ); // Remove terms without language.
125	124	$languages = wp_list_pluck( $languages, 'slug' );
126	125	$wrong_terms = array_diff( $languages, array( $lang->slug ) );
127	126
128	127	if ( ! empty( $wrong_terms ) ) {
		@@ -207,10 +206,10 @@
207	206	* Thanks to Bruno "Aesqe" Babic and its plugin file gallery in which I took all the ideas for this function
208	207	*
209	208	* @since 0.9
210	209	*
211		- * @param string $file Path to the file to delete.
212		- * @return string Empty or unmodified path.
	210	+ * @param string $file
	211	+ * @return string unmodified $file
213	212	*/
214	213	public function wp_delete_file( $file ) {
215	214	global $wpdb;
216	215
		@@ -224,12 +223,11 @@
224	223	)
225	224	);
226	225
227	226	if ( ! empty( $ids ) ) {
228		- // Regenerate intermediate sizes if it's an image ( since we could not prevent WP deleting them before ).
229		- require_once ABSPATH . 'wp-admin/includes/image.php'; // In case the file is deleted outside admin.
230		- wp_update_attachment_metadata( $ids[0], wp_slash( wp_generate_attachment_metadata( $ids[0], $file ) ) ); // Directly uses update_post_meta, so expects slashed.
231		- return ''; // Prevent deleting the main file.
	227	+ // Regenerate intermediate sizes if it's an image ( since we could not prevent WP deleting them before )
	228	+ wp_update_attachment_metadata( $ids[0], wp_generate_attachment_metadata( $ids[0], $file ) );
	229	+ return ''; // Prevent deleting the main file
232	230	}
233	231
234	232	return $file;
235	233	}
		@@ -238,17 +236,13 @@
238	236	* Creates a media translation
239	237	*
240	238	* @since 1.8
241	239	*
242		- * @param int $post_id Original attachment id.
243		- * @param string|object $lang New translation language.
244		- * @return int Attachment id of the translated media.
	240	+ * @param int $post_id
	241	+ * @param string|object $lang
	242	+ * @return int id of the translated media
245	243	*/
246	244	public function create_media_translation( $post_id, $lang ) {
247		- if ( empty( $post_id ) ) {
248		- return $post_id;
249		- }
250		-
251	245	$post = get_post( $post_id );
252	246
253	247	if ( empty( $post ) ) {
254	248	return $post;
		@@ -253,36 +247,32 @@
253	247	if ( empty( $post ) ) {
254	248	return $post;
255	249	}
256	250
257		- $lang = $this->model->get_language( $lang ); // Make sure we get a valid language slug.
	251	+ $lang = $this->model->get_language( $lang ); // Make sure we get a valid language slug
258	252
259		- // Create a new attachment ( translate attachment parent if exists ).
260		- add_filter( 'pll_enable_duplicate_media', '__return_false', 99 ); // Avoid a conflict with automatic duplicate at upload.
	253	+ // Create a new attachment ( translate attachment parent if exists )
	254	+ add_filter( 'pll_enable_duplicate_media', '__return_false', 99 ); // Avoid a conflict with automatic duplicate at upload
261	255	$post->ID = null; // Will force the creation
262	256	$post->post_parent = ( $post->post_parent && $tr_parent = $this->model->post->get_translation( $post->post_parent, $lang->slug ) ) ? $tr_parent : 0;
263		- $post->tax_input = array( 'language' => array( $lang->slug ) ); // Assigns the language.
264		- $tr_id = wp_insert_attachment( wp_slash( (array) $post ) );
265		- remove_filter( 'pll_enable_duplicate_media', '__return_false', 99 ); // Restore automatic duplicate at upload.
	257	+ $post->tax_input = array( 'language' => array( $lang->slug ) ); // Assigns the language
	258	+ $tr_id = wp_insert_attachment( $post );
	259	+ remove_filter( 'pll_enable_duplicate_media', '__return_false', 99 ); // Restore automatic duplicate at upload
266	260
267		- // Copy metadata.
268		- if ( $data = wp_get_attachment_metadata( $post_id, true ) ) { // Unfiltered.
269		- wp_update_attachment_metadata( $tr_id, wp_slash( $data ) ); // Directly uses update_post_meta, so expects slashed.
	261	+ // Copy metadata, attached file and alternative text
	262	+ foreach ( array( '_wp_attachment_metadata', '_wp_attached_file', '_wp_attachment_image_alt' ) as $key ) {
	263	+ if ( $meta = get_post_meta( $post_id, $key, true ) ) {
	264	+ add_post_meta( $tr_id, $key, $meta );
	265	+ }
270	266	}
271	267
272		- // Copy attached file.
273		- if ( $file = get_attached_file( $post_id, true ) ) { // Unfiltered.
274		- update_attached_file( $tr_id, wp_slash( $file ) ); // Directly uses update_post_meta, so expects slashed.
275		- }
	268	+ $this->model->post->set_language( $tr_id, $lang );
276	269
277		- // Copy alternative text. Direct use of the meta as there is no filtered wrapper to manipulate it.
278		- if ( $text = get_post_meta( $post_id, '_wp_attachment_image_alt', true ) ) {
279		- add_post_meta( $tr_id, '_wp_attachment_image_alt', wp_slash( $text ) );
	270	+ $translations = $this->model->post->get_translations( $post_id );
	271	+ if ( ! $translations && $src_lang = $this->model->post->get_language( $post_id ) ) {
	272	+ $translations[ $src_lang->slug ] = $post_id;
280	273	}
281	274
282		- $this->model->post->set_language( $tr_id, $lang );
283		-
284		- $translations = $this->model->post->get_translations( $post_id );
285	275	$translations[ $lang->slug ] = $tr_id;
286	276	$this->model->post->save_translations( $tr_id, $translations );
287	277
288	278	/**
		@@ -289,11 +279,11 @@
289	279	* Fires after a media translation is created
290	280	*
291	281	* @since 1.6.4
292	282	*
293		- * @param int $post_id Post id of the source media.
294		- * @param int $tr_id Post id of the new media translation.
295		- * @param string $slug Language code of the new translation.
	283	+ * @param int $post_id post id of the source media
	284	+ * @param int $tr_id post id of the new media translation
	285	+ * @param string $slug language code of the new translation
296	286	*/
297	287	do_action( 'pll_translate_media', $post_id, $tr_id, $lang->slug );
298	288	return $tr_id;
299	289	}