Changeset 32800
- Timestamp:
- 06/16/2015 08:00:15 PM (9 years ago)
- Location:
- trunk/src
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/class-wp-comments-list-table.php
r32736 r32800 473 473 $out = ''; 474 474 475 if ( $primary === $column_name ) {475 if ( $primary === $column_name ) { 476 476 $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) ); 477 477 $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) ); -
trunk/src/wp-admin/includes/class-wp-links-list-table.php
r32753 r32800 287 287 */ 288 288 protected function handle_row_actions( $link, $column_name, $primary ) { 289 if ( $primary === $column_name ) {289 if ( $primary === $column_name ) { 290 290 $edit_link = get_edit_bookmark_link( $link ); 291 291 -
trunk/src/wp-admin/includes/class-wp-list-table.php
r32724 r32800 635 635 $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 0; 636 636 637 if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )637 if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] ) 638 638 $pagenum = $this->_pagination_args['total_pages']; 639 639 -
trunk/src/wp-admin/includes/class-wp-media-list-table.php
r32798 r32800 634 634 */ 635 635 protected function handle_row_actions( $link, $column_name, $primary ) { 636 if ( $primary === $column_name ) {636 if ( $primary === $column_name ) { 637 637 return $this->row_actions( $this->_get_row_actions( $post, $att_title ) ); 638 638 } -
trunk/src/wp-admin/includes/class-wp-press-this.php
r32720 r32800 1046 1046 if ( ! empty( $data['t'] ) ) { 1047 1047 $title = $data['t']; 1048 } elseif ( ! empty( $data['_meta'] ) ) {1048 } elseif ( ! empty( $data['_meta'] ) ) { 1049 1049 if ( ! empty( $data['_meta']['twitter:title'] ) ) { 1050 1050 $title = $data['_meta']['twitter:title']; -
trunk/src/wp-admin/includes/deprecated.php
r32650 r32800 573 573 if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results 574 574 $args = array(); 575 if ( ! empty($this->search_term) )575 if ( ! empty($this->search_term) ) 576 576 $args['usersearch'] = urlencode($this->search_term); 577 if ( ! empty($this->role) )577 if ( ! empty($this->role) ) 578 578 $args['role'] = urlencode($this->role); 579 579 -
trunk/src/wp-admin/includes/nav-menu.php
r32691 r32800 140 140 141 141 <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>"> 142 <?php if ( 'custom' == $item->type ) : ?>142 <?php if ( 'custom' == $item->type ) : ?> 143 143 <p class="field-url description description-wide"> 144 144 <label for="edit-menu-item-url-<?php echo $item_id; ?>"> … … 198 198 199 199 <div class="menu-item-actions description-wide submitbox"> 200 <?php if ( 'custom' != $item->type && $original_title !== false ) : ?>200 <?php if ( 'custom' != $item->type && $original_title !== false ) : ?> 201 201 <p class="link-to-original"> 202 202 <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?> … … 460 460 461 461 // If first time editing, disable advanced items by default. 462 if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {462 if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) { 463 463 $user = wp_get_current_user(); 464 464 update_user_option($user->ID, 'managenav-menuscolumnshidden', … … 1181 1181 $result .= '</div>'; 1182 1182 1183 if ( empty($menu_items) )1183 if ( empty($menu_items) ) 1184 1184 return $result . ' <ul class="menu" id="menu-to-edit"> </ul>'; 1185 1185 -
trunk/src/wp-admin/includes/post.php
r32673 r32800 1319 1319 1320 1320 if ( isset( $view_post ) ) { 1321 if ( 'draft' == $post->post_status ) {1321 if ( 'draft' == $post->post_status ) { 1322 1322 $preview_link = set_url_scheme( get_permalink( $post->ID ) ); 1323 1323 /** This filter is documented in wp-admin/includes/meta-boxes.php */ -
trunk/src/wp-admin/network.php
r32654 r32800 59 59 function allow_subdomain_install() { 60 60 $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) ); 61 if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )61 if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) ) 62 62 return false; 63 63 -
trunk/src/wp-includes/admin-bar.php
r32537 r32800 505 505 && ( $post_type_object->show_in_admin_bar ) ) 506 506 { 507 if ( 'draft' == $post->post_status ) {507 if ( 'draft' == $post->post_status ) { 508 508 $preview_link = set_url_scheme( get_permalink( $post->ID ) ); 509 509 /** This filter is documented in wp-admin/includes/meta-boxes.php */ -
trunk/src/wp-includes/class-wp-image-editor-imagick.php
r32650 r32800 137 137 $this->image = new Imagick( $this->file ); 138 138 139 if ( ! $this->image->valid() )139 if ( ! $this->image->valid() ) 140 140 return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file); 141 141 -
trunk/src/wp-includes/class-wp-image-editor.php
r32650 r32800 349 349 $dir = $info['dirname']; 350 350 351 if ( isset( $info['extension'] ) )351 if ( isset( $info['extension'] ) ) 352 352 $ext = $info['extension']; 353 353 -
trunk/src/wp-includes/class-wp-xmlrpc-server.php
r32733 r32800 3963 3963 do_action( 'xmlrpc_call', 'wp.getPostType' ); 3964 3964 3965 if ( ! post_type_exists( $post_type_name ) )3965 if ( ! post_type_exists( $post_type_name ) ) 3966 3966 return new IXR_Error( 403, __( 'Invalid post type' ) ); 3967 3967 3968 3968 $post_type = get_post_type_object( $post_type_name ); 3969 3969 3970 if ( ! current_user_can( $post_type->cap->edit_posts ) )3970 if ( ! current_user_can( $post_type->cap->edit_posts ) ) 3971 3971 return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) ); 3972 3972 … … 4020 4020 4021 4021 foreach( $post_types as $post_type ) { 4022 if ( ! current_user_can( $post_type->cap->edit_posts ) )4022 if ( ! current_user_can( $post_type->cap->edit_posts ) ) 4023 4023 continue; 4024 4024 -
trunk/src/wp-includes/default-constants.php
r31056 r32800 18 18 // set memory limits 19 19 if ( !defined('WP_MEMORY_LIMIT') ) { 20 if ( is_multisite() ) {20 if ( is_multisite() ) { 21 21 define('WP_MEMORY_LIMIT', '64M'); 22 22 } else { -
trunk/src/wp-includes/feed-atom-comments.php
r29014 r32800 44 44 <link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?>" /> 45 45 <id><?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?></id> 46 <?php } elseif (is_search()) { ?>46 <?php } elseif (is_search()) { ?> 47 47 <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" /> 48 48 <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" /> -
trunk/src/wp-includes/feed.php
r32765 r32800 110 110 $max_post_time = max( $post_times ); 111 111 112 if ( $wp_query->is_comment_feed() ) {112 if ( $wp_query->is_comment_feed() ) { 113 113 $max_comment_time = $wpdb->get_var( $wpdb->prepare( "SELECT MAX(comment_date_gmt) FROM $wpdb->comments WHERE comment_post_ID IN ('%s') AND comment_approved = '1'", $postids ) ); 114 114 … … 677 677 do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) ); 678 678 $feed->init(); 679 $feed->set_output_encoding( get_option( 'blog_charset' ) ); 679 $feed->set_output_encoding( get_option( 'blog_charset' ) ); 680 680 $feed->handle_content_type(); 681 681 -
trunk/src/wp-includes/formatting.php
r32797 r32800 1583 1583 $tag = strtolower(substr($regex[1],1)); 1584 1584 // if too many closing tags 1585 if ( $stacksize <= 0 ) {1585 if ( $stacksize <= 0 ) { 1586 1586 $tag = ''; 1587 1587 // or close to be safe $tag = '/' . $tag; … … 1638 1638 // Attributes 1639 1639 $attributes = $regex[2]; 1640 if ( ! empty( $attributes ) && $attributes[0] != '>' )1640 if ( ! empty( $attributes ) && $attributes[0] != '>' ) 1641 1641 $attributes = ' ' . $attributes; 1642 1642 … … 2743 2743 */ 2744 2744 $filtered = apply_filters( 'pre_ent2ncr', null, $text ); 2745 if ( null !== $filtered )2745 if ( null !== $filtered ) 2746 2746 return $filtered; 2747 2747 -
trunk/src/wp-includes/functions.php
r32797 r32800 1485 1485 1486 1486 // Strip the protocol. 1487 if ( wp_is_stream( $target ) ) {1487 if ( wp_is_stream( $target ) ) { 1488 1488 list( $wrapper, $target ) = explode( '://', $target, 2 ); 1489 1489 } … … 1493 1493 1494 1494 // Put the wrapper back on the target. 1495 if ( $wrapper !== null ) {1495 if ( $wrapper !== null ) { 1496 1496 $target = $wrapper . '://' . $target; 1497 1497 } -
trunk/src/wp-includes/ms-files.php
r24305 r32800 12 12 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' ); 13 13 14 if ( !is_multisite() )14 if ( !is_multisite() ) 15 15 die( 'Multisite support not enabled' ); 16 16 … … 31 31 32 32 $mime = wp_check_filetype( $file ); 33 if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )33 if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) 34 34 $mime[ 'type' ] = mime_content_type( $file ); 35 35 36 if ( $mime[ 'type' ] )36 if ( $mime[ 'type' ] ) 37 37 $mimetype = $mime[ 'type' ]; 38 38 else … … 61 61 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false; 62 62 63 if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )63 if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) 64 64 $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false; 65 65 -
trunk/src/wp-includes/ms-functions.php
r32733 r32800 1864 1864 clean_term_cache($term_id); 1865 1865 } 1866 if ( $recurse_start )1866 if ( $recurse_start ) 1867 1867 $global_terms_recurse = null; 1868 1868 -
trunk/src/wp-includes/pluggable.php
r32793 r32800 410 410 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" 411 411 $recipient_name = ''; 412 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {412 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { 413 413 if ( count( $matches ) == 3 ) { 414 414 $recipient_name = $matches[1]; … … 432 432 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" 433 433 $recipient_name = ''; 434 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {434 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { 435 435 if ( count( $matches ) == 3 ) { 436 436 $recipient_name = $matches[1]; … … 450 450 // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>" 451 451 $recipient_name = ''; 452 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {452 if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) { 453 453 if ( count( $matches ) == 3 ) { 454 454 $recipient_name = $matches[1]; … … 1274 1274 /** 1275 1275 * Filter the redirect fallback URL for when the provided redirect is not safe (local). 1276 * 1276 * 1277 1277 * @since 4.3.0 1278 * 1278 * 1279 1279 * @param string $fallback_url The fallback URL to use by default. 1280 1280 * @param int $status The redirect status. -
trunk/src/wp-includes/post.php
r32762 r32800 461 461 * 462 462 * @property string $page_template 463 * 463 * 464 464 * @property-read array $ancestors 465 465 * @property-read int $post_category … … 3295 3295 $post_status = 'future'; 3296 3296 } 3297 } elseif ( 'future' == $post_status ) {3297 } elseif ( 'future' == $post_status ) { 3298 3298 $now = gmdate('Y-m-d H:i:59'); 3299 3299 if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) { -
trunk/src/wp-includes/revision.php
r32733 r32800 151 151 152 152 //don't save revision if post unchanged 153 if ( ! $post_has_changed ) {153 if ( ! $post_has_changed ) { 154 154 return; 155 155 }
Note: See TracChangeset
for help on using the changeset viewer.