Changeset 31217
- Timestamp:
- 01/16/2015 09:18:52 PM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/plugin.php
r31106 r31217 806 806 $plugins_dir = trailingslashit( $plugins_dir ); 807 807 808 $translations_dir = $wp_filesystem->wp_lang_dir();809 $translations_dir = trailingslashit( $translations_dir );810 811 808 $plugin_translations = wp_get_installed_translations( 'plugins' ); 812 809 -
trunk/src/wp-admin/includes/theme.php
r31188 r31217 69 69 return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) ); 70 70 } 71 72 $translations_dir = $wp_filesystem->wp_lang_dir();73 $translations_dir = trailingslashit( $translations_dir );74 71 75 72 $theme_translations = wp_get_installed_translations( 'themes' ); -
trunk/src/wp-includes/date.php
r31179 r31217 392 392 393 393 // Throw a notice for each failing value. 394 $is_between = true;395 394 foreach ( (array) $date_query[ $key ] as $_value ) { 396 395 $is_between = $_value >= $check['min'] && $_value <= $check['max']; -
trunk/src/wp-includes/ms-functions.php
r31188 r31217 1806 1806 } elseif ( $global_id != $term_id ) { 1807 1807 $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) ); 1808 if ( null != $local_id ) 1809 $local_id =global_terms( $local_id );1810 if ( 10 < $global_terms_recurse ) 1808 if ( null != $local_id ) { 1809 global_terms( $local_id ); 1810 if ( 10 < $global_terms_recurse ) { 1811 1811 $global_id = $term_id; 1812 } 1813 } 1812 1814 } 1813 1815 -
trunk/src/wp-includes/wp-diff.php
r31135 r31217 274 274 275 275 // If they're too different, don't include any <ins> or <dels> 276 if ( $diff_count =preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {276 if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) { 277 277 // length of all text between <ins> or <del> 278 278 $stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
Note: See TracChangeset
for help on using the changeset viewer.