enmi-conf.org: comparison wp/wp-includes/class.wp-scripts.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	public $default_dirs;
 	/**
 	 * Holds a string which contains the type attribute for script tag.
 	 *
-	 * If the current theme does not declare HTML5 support for 'script',
+	 * If the active theme does not declare HTML5 support for 'script',
 	 * then it initializes as `type='text/javascript'`.
 	 *
 	 * @since 5.3.0
 	 * @var string
 	 */
 		/**
 		 * Fires when the WP_Scripts instance is initialized.
 		 *
 		 * @since 2.6.0
 		 *
-		 * @param WP_Scripts $this WP_Scripts instance (passed by reference).
+		 * @param WP_Scripts $wp_scripts WP_Scripts instance (passed by reference).
 		 */
 		do_action_ref_array( 'wp_default_scripts', array( &$this ) );
 	}
 	/**
 	/**
 	 * Prints extra scripts of a registered script.
 	 *
 	 * @since 2.1.0
-	 * @since 2.8.0 Added the `$echo` parameter.
+	 * @since 2.8.0 Added the `$display` parameter.
 	 * @deprecated 3.3.0
 	 *
 	 * @see print_extra_script()
 	 *
-	 * @param string $handle The script's registered handle.
+	 * @param string $handle  The script's registered handle.
-	 * @param bool   $echo   Optional. Whether to echo the extra script
+	 * @param bool   $display Optional. Whether to print the extra script
-	 *                       instead of just returning it. Default true.
+	 *                        instead of just returning it. Default true.
-	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true,
+	 * @return bool|string|void Void if no data exists, extra scripts if `$display` is true,
 	 *                          true otherwise.
 	 */
-	public function print_scripts_l10n( $handle, $echo = true ) {
+	public function print_scripts_l10n( $handle, $display = true ) {
 		_deprecated_function( __FUNCTION__, '3.3.0', 'WP_Scripts::print_extra_script()' );
-		return $this->print_extra_script( $handle, $echo );
+		return $this->print_extra_script( $handle, $display );
 	}
 	/**
 	 * Prints extra scripts of a registered script.
 	 *
 	 * @since 3.3.0
 	 *
-	 * @param string $handle The script's registered handle.
+	 * @param string $handle  The script's registered handle.
-	 * @param bool   $echo   Optional. Whether to echo the extra script
+	 * @param bool   $display Optional. Whether to print the extra script
-	 *                       instead of just returning it. Default true.
+	 *                        instead of just returning it. Default true.
-	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true,
+	 * @return bool|string|void Void if no data exists, extra scripts if `$display` is true,
 	 *                          true otherwise.
 	 */
-	public function print_extra_script( $handle, $echo = true ) {
+	public function print_extra_script( $handle, $display = true ) {
 		$output = $this->get_data( $handle, 'data' );
 		if ( ! $output ) {
 			return;
 		}
-		if ( ! $echo ) {
+		if ( ! $display ) {
 			return $output;
 		}
 		printf( "<script%s id='%s-js-extra'>\n", $this->type_attr, esc_attr( $handle ) );
 		if ( $before_handle || $after_handle ) {
 			$inline_script_tag = $cond_before . $before_handle . $after_handle . $cond_after;
 		} else {
 			$inline_script_tag = '';
 		}
+		/*
+		 * Prevent concatenation of scripts if the text domain is defined
+		 * to ensure the dependency order is respected.
+		 */
+		$translations_stop_concat = ! empty( $obj->textdomain );
 		$translations = $this->print_translations( $handle, false );
 		if ( $translations ) {
 			$translations = sprintf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $translations );
 		}
 			 * @param string $src    Script loader source path.
 			 * @param string $handle Script handle.
 			 */
 			$srce = apply_filters( 'script_loader_src', $src, $handle );
-			if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle || $translations ) ) {
+			if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle || $translations_stop_concat ) ) {
 				$this->do_concat = false;
 				// Have to print the so-far concatenated scripts right away to maintain the right order.
 				_print_scripts();
 				$this->reset();
 	 *
 	 * @param string $handle   Name of the script to add the inline script to.
 	 *                         Must be lowercase.
 	 * @param string $position Optional. Whether to add the inline script
 	 *                         before the handle or after. Default 'after'.
-	 * @param bool   $echo     Optional. Whether to echo the script
+	 * @param bool   $display  Optional. Whether to print the script
 	 *                         instead of just returning it. Default true.
 	 * @return string|false Script on success, false otherwise.
 	 */
-	public function print_inline_script( $handle, $position = 'after', $echo = true ) {
+	public function print_inline_script( $handle, $position = 'after', $display = true ) {
 		$output = $this->get_data( $handle, $position );
 		if ( empty( $output ) ) {
 			return false;
 		}
 		$output = trim( implode( "\n", $output ), "\n" );
-		if ( $echo ) {
+		if ( $display ) {
 			printf( "<script%s id='%s-js-%s'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), esc_attr( $position ), $output );
 		}
 		return $output;
 	}
 	/**
 	 * Prints translations set for a specific handle.
 	 *
 	 * @since 5.0.0
 	 *
-	 * @param string $handle Name of the script to add the inline script to.
+	 * @param string $handle  Name of the script to add the inline script to.
-	 *                       Must be lowercase.
+	 *                        Must be lowercase.
-	 * @param bool   $echo   Optional. Whether to echo the script
+	 * @param bool   $display Optional. Whether to print the script
-	 *                       instead of just returning it. Default true.
+	 *                        instead of just returning it. Default true.
 	 * @return string|false Script on success, false otherwise.
 	 */
-	public function print_translations( $handle, $echo = true ) {
+	public function print_translations( $handle, $display = true ) {
 		if ( ! isset( $this->registered[ $handle ] ) || empty( $this->registered[ $handle ]->textdomain ) ) {
 			return false;
 		}
 		$domain = $this->registered[ $handle ]->textdomain;
 		$path   = $this->registered[ $handle ]->translations_path;
 		$json_translations = load_script_textdomain( $handle, $domain, $path );
 		if ( ! $json_translations ) {
-			// Register empty locale data object to ensure the domain still exists.
+			return false;
-			$json_translations = '{ "locale_data": { "messages": { "": {} } } }';
 		}
 		$output = <<<JS
 ( function( domain, translations ) {
 	var localeData = translations.locale_data[ domain ] || translations.locale_data.messages;
 	localeData[""].domain = domain;
 	wp.i18n.setLocaleData( localeData, domain );
 } )( "{$domain}", {$json_translations} );
 JS;
-		if ( $echo ) {
+		if ( $display ) {
 			printf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $output );
 		}
 		return $output;
 	}

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6