Changeset 23626
- Timestamp:
- 03/06/2013 08:07:40 PM (11 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/media.php
r23439 r23626 645 645 'width' => '', 646 646 'caption' => '' 647 ), $attr ));647 ), $attr, 'caption')); 648 648 649 649 if ( 1 > (int) $width || empty($caption) ) … … 705 705 'include' => '', 706 706 'exclude' => '' 707 ), $attr ));707 ), $attr, 'gallery')); 708 708 709 709 $id = intval($id); -
trunk/wp-includes/shortcodes.php
r22401 r23626 290 290 * @param array $pairs Entire list of supported attributes and their defaults. 291 291 * @param array $atts User defined attributes in shortcode tag. 292 * @param string $shortcode Optional. The name of the shortcode, provided for context to enable filtering 292 293 * @return array Combined and filtered attribute list. 293 294 */ 294 function shortcode_atts( $pairs, $atts) {295 function shortcode_atts( $pairs, $atts, $shortcode = '' ) { 295 296 $atts = (array)$atts; 296 297 $out = array(); … … 301 302 $out[$name] = $default; 302 303 } 304 305 if ( $shortcode ) 306 $out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts ); 307 303 308 return $out; 304 309 }
Note: See TracChangeset
for help on using the changeset viewer.