| @@ -3,9 +3,9 @@ | ||
| 3 | 3 | * @package Polylang |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | /** |
| 7 | - * Extends the PLL_Model class with methods needed only in Polylang settings pages. | |
| 7 | + * Extends the PLL_Model class with methods needed only in Polylang settings pages | |
| 8 | 8 | * |
| 9 | 9 | * @since 1.2 |
| 10 | 10 | */ |
| 11 | 11 | class PLL_Admin_Model extends PLL_Model { |
| @@ -11,22 +11,25 @@ | ||
| 11 | 11 | class PLL_Admin_Model extends PLL_Model { |
| 12 | 12 | |
| 13 | 13 | /** |
| 14 | 14 | * Adds a new language |
| 15 | - * and creates a default category for this language. | |
| 15 | + * Creates a default category for this language | |
| 16 | 16 | * |
| 17 | + * List of arguments that $args must contain: | |
| 18 | + * name -> language name ( used only for display ) | |
| 19 | + * slug -> language code ( ideally 2-letters ISO 639-1 language code ) | |
| 20 | + * locale -> WordPress locale. If something wrong is used for the locale, the .mo files will not be loaded... | |
| 21 | + * rtl -> 1 if rtl language, 0 otherwise | |
| 22 | + * term_group -> language order when displayed | |
| 23 | + * | |
| 24 | + * Optional arguments that $args can contain: | |
| 25 | + * no_default_cat -> if set, no default category will be created for this language | |
| 26 | + * flag -> country code, see flags.php | |
| 27 | + * | |
| 17 | 28 | * @since 1.2 |
| 18 | 29 | * |
| 19 | - * @param array $args { | |
| 20 | - * @type string $name Language name ( used only for display ). | |
| 21 | - * @type string $slug Language code ( ideally 2-letters ISO 639-1 language code ). | |
| 22 | - * @type string $locale WordPress locale. If something wrong is used for the locale, the .mo files will not be loaded... | |
| 23 | - * @type int $rtl 1 if rtl language, 0 otherwise. | |
| 24 | - * @type int $term_group Language order when displayed. | |
| 25 | - * @type string $no_default_cat Optional, if set, no default category will be created for this language. | |
| 26 | - * @type string $flag Optional, country code, @see flags.php. | |
| 27 | - * } | |
| 28 | - * @return WP_Error|true true if success / WP_Error if failed. | |
| 30 | + * @param array $args | |
| 31 | + * @return bool true if success / false if failed | |
| 29 | 32 | */ |
| 30 | 33 | public function add_language( $args ) { |
| 31 | 34 | $errors = $this->validate_lang( $args ); |
| 32 | 35 | if ( $errors->get_error_code() ) { // Using has_errors() would be more meaningful but is available only since WP 5.0 |
| @@ -63,13 +66,13 @@ | ||
| 63 | 66 | $mo = new PLL_MO(); |
| 64 | 67 | $mo->export_to_db( $this->get_language( $args['slug'] ) ); |
| 65 | 68 | |
| 66 | 69 | /** |
| 67 | - * Fires when a language is added. | |
| 70 | + * Fires when a language is added | |
| 68 | 71 | * |
| 69 | 72 | * @since 1.9 |
| 70 | 73 | * |
| 71 | - * @param array $args Arguments used to create the language. @see PLL_Admin_Model::add_language(). | |
| 74 | + * @param array $args arguments used to create the language | |
| 72 | 75 | */ |
| 73 | 76 | do_action( 'pll_add_language', $args ); |
| 74 | 77 | |
| 75 | 78 | $this->clean_languages_cache(); // Again to set add mo_id in the cached languages list |
| @@ -77,14 +80,13 @@ | ||
| 77 | 80 | return true; |
| 78 | 81 | } |
| 79 | 82 | |
| 80 | 83 | /** |
| 81 | - * Delete a language. | |
| 84 | + * Delete a language | |
| 82 | 85 | * |
| 83 | 86 | * @since 1.2 |
| 84 | 87 | * |
| 85 | - * @param int $lang_id Language term_id. | |
| 86 | - * @return bool | |
| 88 | + * @param int $lang_id language term_id | |
| 87 | 89 | */ |
| 88 | 90 | public function delete_language( $lang_id ) { |
| 89 | 91 | $lang = $this->get_language( (int) $lang_id ); |
| 90 | 92 | |
| @@ -139,9 +141,9 @@ | ||
| 139 | 141 | } |
| 140 | 142 | |
| 141 | 143 | // Delete the string translations |
| 142 | 144 | $post = wpcom_vip_get_page_by_title( 'polylang_mo_' . $lang->term_id, OBJECT, 'polylang_mo' ); |
| 143 | - if ( $post instanceof WP_Post ) { | |
| 145 | + if ( ! empty( $post ) ) { | |
| 144 | 146 | wp_delete_post( $post->ID ); |
| 145 | 147 | } |
| 146 | 148 | |
| 147 | 149 | // Delete domain |
| @@ -159,22 +161,25 @@ | ||
| 159 | 161 | return true; |
| 160 | 162 | } |
| 161 | 163 | |
| 162 | 164 | /** |
| 163 | - * Updates language properties. | |
| 165 | + * Update language properties | |
| 164 | 166 | * |
| 167 | + * List of arguments that $args must contain: | |
| 168 | + * lang_id -> term_id of the language to modify | |
| 169 | + * name -> language name ( used only for display ) | |
| 170 | + * slug -> language code ( ideally 2-letters ISO 639-1 language code | |
| 171 | + * locale -> WordPress locale. If something wrong is used for the locale, the .mo files will not be loaded... | |
| 172 | + * rtl -> 1 if rtl language, 0 otherwise | |
| 173 | + * term_group -> language order when displayed | |
| 174 | + * | |
| 175 | + * Optional arguments that $args can contain: | |
| 176 | + * flag -> country code, see flags.php | |
| 177 | + * | |
| 165 | 178 | * @since 1.2 |
| 166 | 179 | * |
| 167 | - * @param array $args { | |
| 168 | - * @type int $lang_id Id of the language to modify. | |
| 169 | - * @type string $name Language name ( used only for display ). | |
| 170 | - * @type string $slug Language code ( ideally 2-letters ISO 639-1 language code ). | |
| 171 | - * @type string $locale WordPress locale. If something wrong is used for the locale, the .mo files will not be loaded... | |
| 172 | - * @type int $rtl 1 if rtl language, 0 otherwise. | |
| 173 | - * @type int $term_group Language order when displayed. | |
| 174 | - * @type string $flag Optional, country code, @see flags.php. | |
| 175 | - * } | |
| 176 | - * @return WP_Error|true true if success / WP_Error if failed. | |
| 180 | + * @param array $args | |
| 181 | + * @return bool true if success / false if failed | |
| 177 | 182 | */ |
| 178 | 183 | public function update_language( $args ) { |
| 179 | 184 | $lang = $this->get_language( (int) $args['lang_id'] ); |
| 180 | 185 | |
| @@ -234,21 +239,16 @@ | ||
| 234 | 239 | |
| 235 | 240 | // And finally update the language itself |
| 236 | 241 | $description = maybe_serialize( array( 'locale' => $args['locale'], 'rtl' => (int) $args['rtl'], 'flag_code' => empty( $args['flag'] ) ? '' : $args['flag'] ) ); |
| 237 | 242 | wp_update_term( (int) $lang->term_id, 'language', array( 'slug' => $slug, 'name' => $args['name'], 'description' => $description, 'term_group' => (int) $args['term_group'] ) ); |
| 238 | - if ( empty( $lang->tl_term_id ) ) { | |
| 239 | - // Attempt to repair the term_language if it has been deleted by a database cleaning tool. | |
| 240 | - wp_insert_term( $args['name'], 'term_language', array( 'slug' => 'pll_' . $slug ) ); | |
| 241 | - } else { | |
| 242 | - wp_update_term( (int) $lang->tl_term_id, 'term_language', array( 'slug' => 'pll_' . $slug, 'name' => $args['name'] ) ); | |
| 243 | - } | |
| 243 | + wp_update_term( (int) $lang->tl_term_id, 'term_language', array( 'slug' => 'pll_' . $slug, 'name' => $args['name'] ) ); | |
| 244 | 244 | |
| 245 | 245 | /** |
| 246 | - * Fires when a language is updated. | |
| 246 | + * Fires when a language is added | |
| 247 | 247 | * |
| 248 | 248 | * @since 1.9 |
| 249 | 249 | * |
| 250 | - * @param array $args Arguments used to modify the language. @see PLL_Admin_Model::update_language(). | |
| 250 | + * @param array $args arguments used to modify the language | |
| 251 | 251 | */ |
| 252 | 252 | do_action( 'pll_update_language', $args ); |
| 253 | 253 | |
| 254 | 254 | $this->clean_languages_cache(); |
| @@ -256,17 +256,17 @@ | ||
| 256 | 256 | return true; |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | /** |
| 260 | - * Validates data entered when creating or updating a language. | |
| 260 | + * Validates data entered when creating or updating a language | |
| 261 | 261 | * |
| 262 | - * @see PLL_Admin_Model::add_language(). | |
| 262 | + * @see PLL_Admin_Model::add_language | |
| 263 | 263 | * |
| 264 | 264 | * @since 0.4 |
| 265 | 265 | * |
| 266 | - * @param array $args Parameters of {@see PLL_Admin_Model::add_language() or @see PLL_Admin_Model::update_language()}. | |
| 267 | - * @param PLL_Language $lang Optional the language currently updated, the language is created if not set. | |
| 268 | - * @return WP_Error | |
| 266 | + * @param array $args | |
| 267 | + * @param object $lang optional the language currently updated, the language is created if not set | |
| 268 | + * @return bool true if success / false if failed | |
| 269 | 269 | */ |
| 270 | 270 | protected function validate_lang( $args, $lang = null ) { |
| 271 | 271 | $errors = new WP_Error(); |
| 272 | 272 | |
| @@ -281,9 +281,9 @@ | ||
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | // Validate slug is unique |
| 284 | 284 | foreach ( $this->get_languages_list() as $language ) { |
| 285 | - if ( $language->slug === $args['slug'] && ( null === $lang || $lang->term_id !== $language->term_id ) ) { | |
| 285 | + if ( $language->slug === $args['slug'] && ( null === $lang || ( isset( $lang ) && $lang->term_id != $language->term_id ) ) ) { | |
| 286 | 286 | $errors->add( 'pll_non_unique_slug', __( 'The language code must be unique', 'polylang' ) ); |
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | |
| @@ -309,29 +309,23 @@ | ||
| 309 | 309 | return $errors; |
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | /** |
| 313 | - * Assigns a language to posts or terms in mass. | |
| 313 | + * Used to set the language of posts or terms in mass | |
| 314 | 314 | * |
| 315 | 315 | * @since 1.2 |
| 316 | 316 | * |
| 317 | - * @param string $type Either 'post' or 'term'. | |
| 318 | - * @param int[] $ids Array of post ids or term ids. | |
| 319 | - * @param PLL_Language|string $lang Language to assign to the posts or terms. | |
| 320 | - * @return void | |
| 317 | + * @param string $type either 'post' or 'term' | |
| 318 | + * @param array $ids array of post ids or term ids | |
| 319 | + * @param object|string $lang object or slug | |
| 321 | 320 | */ |
| 322 | 321 | public function set_language_in_mass( $type, $ids, $lang ) { |
| 323 | 322 | global $wpdb; |
| 324 | 323 | |
| 325 | - $lang = $this->get_language( $lang ); | |
| 326 | - | |
| 327 | - if ( empty( $lang ) ) { | |
| 328 | - return; | |
| 329 | - } | |
| 330 | - | |
| 324 | + $ids = array_map( 'intval', $ids ); | |
| 325 | + $lang = $this->get_language( $lang ); | |
| 331 | 326 | $tt_id = 'term' === $type ? $lang->tl_term_taxonomy_id : $lang->term_taxonomy_id; |
| 332 | 327 | $values = array(); |
| 333 | - $ids = array_map( 'intval', $ids ); | |
| 334 | 328 | |
| 335 | 329 | foreach ( $ids as $id ) { |
| 336 | 330 | $values[] = $wpdb->prepare( '( %d, %d )', $id, $tt_id ); |
| 337 | 331 | } |
| @@ -358,15 +352,14 @@ | ||
| 358 | 352 | } |
| 359 | 353 | } |
| 360 | 354 | |
| 361 | 355 | /** |
| 362 | - * Creates translations groups in mass. | |
| 356 | + * Used to create a translations groups in mass | |
| 363 | 357 | * |
| 364 | 358 | * @since 1.6.3 |
| 365 | 359 | * |
| 366 | - * @param string $type Either 'post' or 'term' | |
| 367 | - * @param array $translations Array of translations arrays. | |
| 368 | - * @return void | |
| 360 | + * @param string $type either 'post' or 'term' | |
| 361 | + * @param array $translations array of translations arrays | |
| 369 | 362 | */ |
| 370 | 363 | public function set_translation_in_mass( $type, $translations ) { |
| 371 | 364 | global $wpdb; |
| 372 | 365 | |
| @@ -411,17 +404,15 @@ | ||
| 411 | 404 | // Get all terms with term_taxonomy_id |
| 412 | 405 | $terms = get_terms( $taxonomy, array( 'hide_empty' => false ) ); |
| 413 | 406 | $trs = array(); |
| 414 | 407 | |
| 415 | - // Prepare objects relationships. | |
| 416 | - if ( is_array( $terms ) ) { | |
| 417 | - foreach ( $terms as $term ) { | |
| 418 | - $t = maybe_unserialize( $term->description ); | |
| 419 | - if ( in_array( $t, $translations ) ) { | |
| 420 | - foreach ( $t as $object_id ) { | |
| 421 | - if ( ! empty( $object_id ) ) { | |
| 422 | - $trs[] = $wpdb->prepare( '( %d, %d )', $object_id, $term->term_taxonomy_id ); | |
| 423 | - } | |
| 408 | + // Prepare objects relationships | |
| 409 | + foreach ( $terms as $term ) { | |
| 410 | + $t = maybe_unserialize( $term->description ); | |
| 411 | + if ( in_array( $t, $translations ) ) { | |
| 412 | + foreach ( $t as $object_id ) { | |
| 413 | + if ( ! empty( $object_id ) ) { | |
| 414 | + $trs[] = $wpdb->prepare( '( %d, %d )', $object_id, $term->term_taxonomy_id ); | |
| 424 | 415 | } |
| 425 | 416 | } |
| 426 | 417 | } |
| 427 | 418 | } |
| @@ -436,32 +427,27 @@ | ||
| 436 | 427 | clean_term_cache( $term_ids, $taxonomy ); |
| 437 | 428 | } |
| 438 | 429 | |
| 439 | 430 | /** |
| 440 | - * Returns untranslated posts and terms ids ( used in settings ). | |
| 431 | + * Returns untranslated posts and terms ids ( used in settings ) | |
| 441 | 432 | * |
| 442 | 433 | * @since 0.9 |
| 443 | - * @since 2.2.6 Add the $limit argument. | |
| 434 | + * @since 2.2.6 Add the $limit argument | |
| 444 | 435 | * |
| 445 | - * @param int $limit Max number of posts or terms to return. Defaults to -1 (no limit). | |
| 446 | - * @return array { | |
| 447 | - * Objects without language. | |
| 448 | - * | |
| 449 | - * @type int[] $posts Array of post ids. | |
| 450 | - * @type int[] $terms Array of term ids. | |
| 451 | - * } | |
| 436 | + * @param in $limit Max number of posts or terms to return. Defaults to -1 (no limit). | |
| 437 | + * @return array Array made of an array of post ids and an array of term ids | |
| 452 | 438 | */ |
| 453 | 439 | public function get_objects_with_no_lang( $limit = -1 ) { |
| 454 | 440 | global $wpdb; |
| 455 | 441 | |
| 456 | 442 | /** |
| 457 | - * Filters the max number of posts or terms to return when searching objects with no language. | |
| 443 | + * Filters the max number of posts or terms to return when searching objects with no language | |
| 458 | 444 | * This filter can be used to decrease the memory usage in case the number of objects |
| 459 | 445 | * without language is too big. Using a negative value is equivalent to have no limit. |
| 460 | 446 | * |
| 461 | 447 | * @since 2.2.6 |
| 462 | 448 | * |
| 463 | - * @param int $limit Max number of posts or terms to retrieve from the database. | |
| 449 | + * @param int $limit Max number of posts or terms to retrieve from the database | |
| 464 | 450 | */ |
| 465 | 451 | $limit = (int) apply_filters( 'get_objects_with_no_lang_limit', $limit ); |
| 466 | 452 | |
| 467 | 453 | $posts = get_posts( |
| @@ -497,26 +483,24 @@ | ||
| 497 | 483 | ); |
| 498 | 484 | // PHPCS:enable |
| 499 | 485 | |
| 500 | 486 | /** |
| 501 | - * Filters the list of untranslated posts ids and terms ids | |
| 487 | + * Filter the list of untranslated posts ids and terms ids | |
| 502 | 488 | * |
| 503 | 489 | * @since 0.9 |
| 504 | 490 | * |
| 505 | - * @param array|false $objects false if no ids found, list of post and/or term ids otherwise. | |
| 491 | + * @param bool|array $objects false if no ids found, list of post and/or term ids otherwise | |
| 506 | 492 | */ |
| 507 | 493 | return apply_filters( 'pll_get_objects_with_no_lang', empty( $posts ) && empty( $terms ) ? false : array( 'posts' => $posts, 'terms' => $terms ) ); |
| 508 | 494 | } |
| 509 | 495 | |
| 510 | 496 | /** |
| 511 | - * Updates the translations when a language slug has been modified in settings | |
| 512 | - * or deletes them when a language is removed. | |
| 497 | + * Used to delete translations or update the translations when a language slug has been modified in settings | |
| 513 | 498 | * |
| 514 | 499 | * @since 0.5 |
| 515 | 500 | * |
| 516 | - * @param string $old_slug The old language slug. | |
| 517 | - * @param string $new_slug Optional, the new language slug, if not set it means that the language has been deleted. | |
| 518 | - * @return void | |
| 501 | + * @param string $old_slug the old language slug | |
| 502 | + * @param string $new_slug optional, the new language slug, if not set it means the correspondent has been deleted | |
| 519 | 503 | */ |
| 520 | 504 | public function update_translations( $old_slug, $new_slug = '' ) { |
| 521 | 505 | global $wpdb; |
| 522 | 506 | |
| @@ -525,28 +509,26 @@ | ||
| 525 | 509 | $dr = array(); |
| 526 | 510 | $dt = array(); |
| 527 | 511 | $ut = array(); |
| 528 | 512 | |
| 529 | - if ( is_array( $terms ) ) { | |
| 530 | - foreach ( $terms as $term ) { | |
| 531 | - $term_ids[ $term->taxonomy ][] = $term->term_id; | |
| 532 | - $tr = maybe_unserialize( $term->description ); | |
| 533 | - if ( ! empty( $tr[ $old_slug ] ) ) { | |
| 534 | - if ( $new_slug ) { | |
| 535 | - $tr[ $new_slug ] = $tr[ $old_slug ]; // Suppress this for delete | |
| 536 | - } else { | |
| 537 | - $dr['id'][] = (int) $tr[ $old_slug ]; | |
| 538 | - $dr['tt'][] = (int) $term->term_taxonomy_id; | |
| 539 | - } | |
| 540 | - unset( $tr[ $old_slug ] ); | |
| 513 | + foreach ( $terms as $term ) { | |
| 514 | + $term_ids[ $term->taxonomy ][] = $term->term_id; | |
| 515 | + $tr = maybe_unserialize( $term->description ); | |
| 516 | + if ( ! empty( $tr[ $old_slug ] ) ) { | |
| 517 | + if ( $new_slug ) { | |
| 518 | + $tr[ $new_slug ] = $tr[ $old_slug ]; // Suppress this for delete | |
| 519 | + } else { | |
| 520 | + $dr['id'][] = (int) $tr[ $old_slug ]; | |
| 521 | + $dr['tt'][] = (int) $term->term_taxonomy_id; | |
| 522 | + } | |
| 523 | + unset( $tr[ $old_slug ] ); | |
| 541 | 524 | |
| 542 | - if ( empty( $tr ) || 1 == count( $tr ) ) { | |
| 543 | - $dt['t'][] = (int) $term->term_id; | |
| 544 | - $dt['tt'][] = (int) $term->term_taxonomy_id; | |
| 545 | - } else { | |
| 546 | - $ut['case'][] = $wpdb->prepare( 'WHEN %d THEN %s', $term->term_id, maybe_serialize( $tr ) ); | |
| 547 | - $ut['in'][] = (int) $term->term_id; | |
| 548 | - } | |
| 525 | + if ( empty( $tr ) || 1 == count( $tr ) ) { | |
| 526 | + $dt['t'][] = (int) $term->term_id; | |
| 527 | + $dt['tt'][] = (int) $term->term_taxonomy_id; | |
| 528 | + } else { | |
| 529 | + $ut['case'][] = $wpdb->prepare( 'WHEN %d THEN %s', $term->term_id, maybe_serialize( $tr ) ); | |
| 530 | + $ut['in'][] = (int) $term->term_id; | |
| 549 | 531 | } |
| 550 | 532 | } |
| 551 | 533 | } |
| 552 | 534 | |
| @@ -586,14 +568,13 @@ | ||
| 586 | 568 | } |
| 587 | 569 | |
| 588 | 570 | /** |
| 589 | 571 | * Updates the default language |
| 590 | - * taking care to update the default category & the nav menu locations. | |
| 572 | + * taking care to update the default category & the nav menu locations | |
| 591 | 573 | * |
| 592 | 574 | * @since 1.8 |
| 593 | 575 | * |
| 594 | - * @param string $slug New language slug. | |
| 595 | - * @return void | |
| 576 | + * @param string $slug new language slug | |
| 596 | 577 | */ |
| 597 | 578 | public function update_default_lang( $slug ) { |
| 598 | 579 | // The nav menus stored in theme locations should be in the default language |
| 599 | 580 | $theme = get_stylesheet(); |
