Make WordPress Core

Changeset 54351


Ignore:
Timestamp:
09/28/2022 10:17:38 PM (19 months ago)
Author:
SergeyBiryukov
Message:

I18N: Use correct default value for JavaScript translations path.

The $path parameter of some script translation functions had a default value of null, even though the parameter is documented as a string.

This commit corrects the default value for $path in:

  • WP_Dependency::set_translations()
  • WP_Scripts::set_translations()
  • wp_set_script_translations()

Additionally, this commit removes an is_string() check for $path in load_script_textdomain(). Now that the default value for $path in that function has also been corrected to an empty string instead of null, that check is no longer necessary, as it would hide an error which should be fixed (at the source of the problem) instead.

Follow-up to [54349].

Props jrf, johnjamesjacoby.
See #55967, #55656.

Location:
trunk/src/wp-includes
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp-dependency.php

    r54133 r54351  
    127127     * @return bool False if $domain is not a string, true otherwise.
    128128     */
    129     public function set_translations( $domain, $path = null ) {
     129    public function set_translations( $domain, $path = '' ) {
    130130        if ( ! is_string( $domain ) ) {
    131131            return false;
  • trunk/src/wp-includes/class-wp-scripts.php

    r54254 r54351  
    574574     * @return bool True if the text domain was registered, false if not.
    575575     */
    576     public function set_translations( $handle, $domain = 'default', $path = null ) {
     576    public function set_translations( $handle, $domain = 'default', $path = '' ) {
    577577        if ( ! isset( $this->registered[ $handle ] ) ) {
    578578            return false;
     
    606606
    607607        $domain = $this->registered[ $handle ]->textdomain;
    608         $path   = $this->registered[ $handle ]->translations_path;
     608        $path   = '';
     609
     610        if ( isset( $this->registered[ $handle ]->translations_path ) ) {
     611            $path = $this->registered[ $handle ]->translations_path;
     612        }
    609613
    610614        $json_translations = load_script_textdomain( $handle, $domain, $path );
  • trunk/src/wp-includes/functions.wp-scripts.php

    r53060 r54351  
    238238 * @return bool True if the text domain was successfully localized, false otherwise.
    239239 */
    240 function wp_set_script_translations( $handle, $domain = 'default', $path = null ) {
     240function wp_set_script_translations( $handle, $domain = 'default', $path = '' ) {
    241241    global $wp_scripts;
    242242
  • trunk/src/wp-includes/l10n.php

    r54349 r54351  
    10661066    }
    10671067
    1068     if ( is_string( $path ) ) {
    1069         $path = untrailingslashit( $path );
    1070     }
    1071 
     1068    $path   = untrailingslashit( $path );
    10721069    $locale = determine_locale();
    10731070
Note: See TracChangeset for help on using the changeset viewer.