Changeset 47967
- Timestamp:
- 06/10/2020 06:26:13 PM (5 years ago)
- Location:
- branches/4.9
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.9
- Property svn:mergeinfo changed
/trunk merged: 47949-47951
- Property svn:mergeinfo changed
-
branches/4.9/src/wp-admin/includes/media.php
r42450 r47967 2832 2832 if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) { 2833 2833 echo ': ' . __( 'Displayed on attachment pages.' ); 2834 } ?></label> 2835 <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?> 2834 } 2835 2836 ?> 2837 </label> 2838 <?php wp_editor( format_to_edit( $post->post_content ), 'attachment_content', $editor_args ); ?> 2836 2839 2837 2840 </div> -
branches/4.9/src/wp-admin/includes/misc.php
r43639 r47967 621 621 break; 622 622 default: 623 if ( '_page' === substr( $option, -5 ) || 'layout_columns' === $option ) { 624 /** 625 * Filters a screen option value before it is set. 626 * 627 * The filter can also be used to modify non-standard [items]_per_page 628 * settings. See the parent function for a full list of standard options. 629 * 630 * Returning false to the filter will skip saving the current option. 631 * 632 * @since 2.8.0 633 * @since 5.4.2 Only applied to options ending with '_page', 634 * or the 'layout_columns' option. 635 * 636 * @see set_screen_options() 637 * 638 * @param bool $keep Whether to save or skip saving the screen option value. 639 * Default false. 640 * @param string $option The option name. 641 * @param int $value The number of rows to use. 642 */ 643 $value = apply_filters( 'set-screen-option', false, $option, $value ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores 644 } 623 645 624 646 /** 625 647 * Filters a screen option value before it is set. 626 648 * 627 * The filter can also be used to modify non-standard [items]_per_page 628 * settings. See the parent function for a full list of standard options. 649 * The dynamic portion of the hook, `$option`, refers to the option name. 629 650 * 630 651 * Returning false to the filter will skip saving the current option. 631 652 * 632 * @since 2.8.0653 * @since 5.4.2 633 654 * 634 655 * @see set_screen_options() 635 656 * 636 * @param bool|int $value Screen option value. Default false to skip. 637 * @param string $option The option name. 638 * @param int $value The number of rows to use. 657 * @param bool $keep Whether to save or skip saving the screen option value. 658 * Default false. 659 * @param string $option The option name. 660 * @param int $value The number of rows to use. 639 661 */ 640 $value = apply_filters( 'set-screen-option', false, $option, $value );662 $value = apply_filters( "set_screen_option_{$option}", false, $option, $value ); 641 663 642 664 if ( false === $value ) -
branches/4.9/src/wp-admin/themes.php
r42811 r47967 338 338 <?php foreach ( $broken_themes as $broken_theme ) : ?> 339 339 <tr> 340 <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>340 <td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : esc_html( $broken_theme->get_stylesheet() ); ?></td> 341 341 <td><?php echo $broken_theme->errors()->get_error_message(); ?></td> 342 342 <?php -
branches/4.9/src/wp-includes/pluggable.php
r46493 r47967 1324 1324 **/ 1325 1325 function wp_validate_redirect($location, $default = '') { 1326 $location = trim( $location, " \t\n\r\0\x08\x0B");1326 $location = wp_sanitize_redirect( trim( $location, " \t\n\r\0\x08\x0B" ) ); 1327 1327 // browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//' 1328 1328 if ( substr($location, 0, 2) == '//' )
Note: See TracChangeset
for help on using the changeset viewer.