Changeset 33627
- Timestamp:
- 08/17/2015 09:38:24 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
-
wp-admin/admin-ajax.php (modified) (1 diff)
-
wp-admin/edit-form-comment.php (modified) (1 diff)
-
wp-admin/includes/upgrade.php (modified) (2 diffs)
-
wp-includes/load.php (modified) (1 diff)
-
wp-includes/shortcodes.php (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/admin-ajax.php
r33154 r33627 57 57 'menu-locations-save', 'menu-quick-search', 'meta-box-order', 'get-permalink', 58 58 'sample-permalink', 'inline-save', 'inline-save-tax', 'find_posts', 'widgets-order', 59 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 59 'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 60 60 'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment', 61 61 'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor', -
trunk/src/wp-admin/edit-form-comment.php
r33177 r33627 132 132 <?php endif; ?> 133 133 134 <?php 134 <?php 135 135 /** 136 136 * Filter miscellaneous actions for the edit comment form sidebar. -
trunk/src/wp-admin/includes/upgrade.php
r33621 r33627 1522 1522 } 1523 1523 } 1524 1524 1525 1525 foreach ( $tables as $table ) { 1526 1526 maybe_convert_table_to_utf8mb4( $table ); … … 2623 2623 /** 2624 2624 * Determine if global tables should be upgraded. 2625 * 2625 * 2626 2626 * This function performs a series of checks to ensure the environment allows 2627 2627 * for the safe upgrading of global WordPress database tables. It is necessary -
trunk/src/wp-includes/load.php
r32607 r33627 765 765 * @global string $text_direction 766 766 * @global WP_Locale $wp_locale The WordPress date and time locale object. 767 * 767 * 768 768 * @staticvar bool $loaded 769 769 */ -
trunk/src/wp-includes/shortcodes.php
r33600 r33627 209 209 $pattern = get_shortcode_regex(); 210 210 $content = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content ); 211 211 212 212 // Always restore square braces so we don't break things like <!--[if IE ]> 213 213 $content = unescape_invalid_shortcodes( $content ); 214 214 215 215 return $content; 216 216 } … … 332 332 $content = strtr( $content, $trans ); 333 333 $trans = array( '[' => '[', ']' => ']' ); 334 334 335 335 $pattern = get_shortcode_regex(); 336 336 $textarr = wp_html_split( $content ); … … 369 369 continue; 370 370 } 371 371 372 372 // Get element name 373 373 $front = array_shift( $attributes ); … … 376 376 preg_match('%[a-zA-Z0-9]+%', $front, $matches); 377 377 $elname = $matches[0]; 378 378 379 379 // Look for shortcodes in each attribute separately. 380 380 foreach ( $attributes as &$attr ) { … … 408 408 } 409 409 $element = $front . implode( '', $attributes ) . $back; 410 410 411 411 // Now encode any remaining [ or ] chars. 412 412 $element = strtr( $element, $trans ); 413 413 } 414 414 415 415 $content = implode( '', $textarr ); 416 416 417 417 return $content; 418 418 } … … 430 430 $trans = array( '[' => '[', ']' => ']' ); 431 431 $content = strtr( $content, $trans ); 432 432 433 433 return $content; 434 434 } … … 540 540 // Always restore square braces so we don't break things like <!--[if IE ]> 541 541 $content = unescape_invalid_shortcodes( $content ); 542 542 543 543 return $content; 544 544 }
Note: See TracChangeset
for help on using the changeset viewer.