Skip to content
Permalink
Browse files

Update code & fix typos.

  • Loading branch information...
bradp committed Jan 12, 2019
1 parent 6107924 commit 053616a89758c9e3a9f6199debf273a1c61e493b
Showing with 223 additions and 223 deletions.
  1. +14 −14 wp-activate.php
  2. +16 −16 wp-admin/custom-header.php
  3. +1 −1 wp-admin/includes/class-wp-list-table.php
  4. +2 −2 wp-admin/includes/class-wp-plugin-install-list-table.php
  5. +34 −34 wp-admin/includes/class-wp-posts-list-table.php
  6. +2 −2 wp-admin/includes/class-wp-screen.php
  7. +1 −1 wp-admin/includes/class-wp-users-list-table.php
  8. +1 −1 wp-admin/includes/meta-boxes.php
  9. +2 −2 wp-admin/includes/ms.php
  10. +8 −8 wp-admin/includes/plugin-install.php
  11. +5 −5 wp-admin/includes/post.php
  12. +9 −9 wp-admin/nav-menus.php
  13. +6 −6 wp-admin/network/site-new.php
  14. +17 −17 wp-admin/options-permalink.php
  15. +8 −8 wp-admin/user-edit.php
  16. +30 −30 wp-admin/users.php
  17. +1 −1 wp-content/themes/twentyeleven/comments.php
  18. +8 −8 wp-content/themes/twentyeleven/content-gallery.php
  19. +5 −5 wp-content/themes/twentyfifteen/header.php
  20. +1 −1 wp-content/themes/twentyfifteen/inc/template-tags.php
  21. +2 −2 wp-content/themes/twentyfourteen/content-aside.php
  22. +2 −2 wp-content/themes/twentyfourteen/content-audio.php
  23. +2 −2 wp-content/themes/twentyfourteen/content-gallery.php
  24. +2 −2 wp-content/themes/twentyfourteen/content-image.php
  25. +2 −2 wp-content/themes/twentyfourteen/content-link.php
  26. +2 −2 wp-content/themes/twentyfourteen/content-none.php
  27. +2 −2 wp-content/themes/twentyfourteen/content-quote.php
  28. +2 −2 wp-content/themes/twentyfourteen/content-video.php
  29. +2 −2 wp-content/themes/twentyfourteen/content.php
  30. +8 −8 wp-content/themes/twentyfourteen/inc/template-tags.php
  31. +1 −1 wp-content/themes/twentyseventeen/template-parts/post/content-none.php
  32. +3 −3 wp-content/themes/twentysixteen/header.php
  33. +1 −1 wp-content/themes/twentysixteen/inc/template-tags.php
  34. +2 −2 wp-content/themes/twentyten/loop.php
  35. +2 −2 wp-content/themes/twentythirteen/content-none.php
  36. +4 −4 wp-includes/feed-atom-comments.php
  37. +1 −1 wp-includes/feed-atom.php
  38. +2 −2 wp-includes/feed-rss2-comments.php
  39. +1 −1 wp-includes/version.php
  40. +1 −1 wp-includes/widgets/class-wp-widget-archives.php
  41. +1 −1 wp-includes/widgets/class-wp-widget-text.php
  42. +5 −5 wp-login.php
  43. +2 −2 wp-signup.php
@@ -135,10 +135,10 @@ function wpmu_activate_stylesheet() {
</form>

<?php
} else {
if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
$signup = $result->get_error_data();
?>
} else {
if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
$signup = $result->get_error_data();
?>
<h2><?php _e( 'Your account is now active!' ); ?></h2>
<?php
echo '<p class="lead-in">';
@@ -162,17 +162,17 @@ function wpmu_activate_stylesheet() {
);
}
echo '</p>';
} elseif ( $result === null || is_wp_error( $result ) ) {
?>
} elseif ( $result === null || is_wp_error( $result ) ) {
?>
<h2><?php _e( 'An error occurred during the activation' ); ?></h2>
<?php if ( is_wp_error( $result ) ) : ?>
<p><?php echo $result->get_error_message(); ?></p>
<?php endif; ?>
<?php
} else {
$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
$user = get_userdata( (int) $result['user_id'] );
?>
} else {
$url = isset( $result['blog_id'] ) ? get_home_url( (int) $result['blog_id'] ) : '';
$user = get_userdata( (int) $result['user_id'] );
?>
<h2><?php _e( 'Your account is now active!' ); ?></h2>

<div id="signup-welcome">
@@ -199,11 +199,11 @@ function wpmu_activate_stylesheet() {
printf( __( 'Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url( 'wp-login.php', 'login' ), network_home_url() );
?>
</p>
<?php
endif;
<?php
endif;
}
}
}
?>
?>
</div>
</div>
<script type="text/javascript">
@@ -642,43 +642,43 @@ public function step_1() {
</tr>
<?php
endif;
if ( ! empty( $this->default_headers ) ) :
?>
if ( ! empty( $this->default_headers ) ) :
?>
<tr>
<th scope="row"><?php _e( 'Default Images' ); ?></th>
<td>
<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ); ?></p>
<?php else : ?>
<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
<?php endif; ?>
<?php
$this->show_header_selector( 'default' );
?>
<?php
$this->show_header_selector( 'default' );
?>
</td>
</tr>
<?php
<?php
endif;
if ( get_header_image() ) :
?>
if ( get_header_image() ) :
?>
<tr>
<th scope="row"><?php _e( 'Remove Image' ); ?></th>
<td>
<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ); ?></p>
<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
</td>
</tr>
<?php
<?php
endif;
$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
if ( $default_image && get_header_image() != $default_image ) :
?>
$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
if ( $default_image && get_header_image() != $default_image ) :
?>
<tr>
<th scope="row"><?php _e( 'Reset Image' ); ?></th>
<td>
<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ); ?></p>
<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
</td>
</tr>
<?php endif; ?>
@@ -741,7 +741,7 @@ public function step_1() {
do_action( 'custom_header_options' );
wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
?>
?>

<?php submit_button( null, 'primary', 'save-header-options' ); ?>
</form>
@@ -1218,7 +1218,7 @@ protected function display_tablenav( $which ) {
endif;
$this->extra_tablenav( $which );
$this->pagination( $which );
?>
?>

<br class="clear" />
</div>
@@ -280,7 +280,7 @@ public function no_items() {
<?php } else { ?>
<div class="no-plugin-results"><?php _e( 'No plugins found. Try a different search.' ); ?></div>
<?php
}
}
}
/**
@@ -392,7 +392,7 @@ protected function display_tablenav( $which ) {
<br class="clear" />
</div>
<?php
}
}
}
/**
@@ -1471,14 +1471,14 @@ public function inline_edit() {
<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
</label>

<?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>
<?php if ( is_post_type_viewable( $screen->post_type ) ) : // is_post_type_viewable check ?>

<label>
<span class="title"><?php _e( 'Slug' ); ?></span>
<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
</label>

<?php
<?php
endif; // is_post_type_viewable check
endif; // $bulk
endif; // post_type_supports title
@@ -1493,39 +1493,39 @@ public function inline_edit() {
<?php
endif; // $bulk
if ( post_type_supports( $screen->post_type, 'author' ) ) :
$authors_dropdown = '';
if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
$users_opt = array(
'hide_if_only_one_author' => false,
'who' => 'authors',
'name' => 'post_author',
'class' => 'authors',
'multi' => 1,
'echo' => 0,
'show' => 'display_name_with_login',
);
if ( $bulk ) {
$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
}
if ( post_type_supports( $screen->post_type, 'author' ) ) :
$authors_dropdown = '';
if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
$users_opt = array(
'hide_if_only_one_author' => false,
'who' => 'authors',
'name' => 'post_author',
'class' => 'authors',
'multi' => 1,
'echo' => 0,
'show' => 'display_name_with_login',
);
if ( $bulk ) {
$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
}
if ( $authors = wp_dropdown_users( $users_opt ) ) :
$authors_dropdown = '<label class="inline-edit-author">';
$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
$authors_dropdown .= $authors;
$authors_dropdown .= '</label>';
endif;
endif; // authors
?>
if ( $authors = wp_dropdown_users( $users_opt ) ) :
$authors_dropdown = '<label class="inline-edit-author">';
$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
$authors_dropdown .= $authors;
$authors_dropdown .= '</label>';
endif;
endif; // authors
?>

<?php
if ( ! $bulk ) {
echo $authors_dropdown;}
<?php
if ( ! $bulk ) {
echo $authors_dropdown;}
endif; // post_type_supports author
if ( ! $bulk && $can_publish ) :
?>
if ( ! $bulk && $can_publish ) :
?>

<div class="inline-edit-group wp-clearfix">
<label class="alignleft">
@@ -1545,7 +1545,7 @@ public function inline_edit() {
</label>
</div>

<?php endif; ?>
<?php endif; ?>

</div></fieldset>

@@ -1690,7 +1690,7 @@ public function inline_edit() {
<?php else : // $bulk ?>

<div class="inline-edit-group wp-clearfix">
<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
<label class="alignleft">
<input type="checkbox" name="comment_status" value="open" />
<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
@@ -1703,7 +1703,7 @@ public function inline_edit() {
<?php endif; ?>
</div>

<?php
<?php
endif; // $bulk
endif; // post_type_supports comments or pings
?>
@@ -918,8 +918,8 @@ public function render_screen_meta() {
</div>
<?php
endif;
if ( $this->show_screen_options() ) :
?>
if ( $this->show_screen_options() ) :
?>
<div id="screen-options-link-wrap" class="hide-if-no-js screen-meta-toggle">
<button type="button" id="show-settings-link" class="button show-settings" aria-controls="screen-options-wrap" aria-expanded="false"><?php _e( 'Screen Options' ); ?></button>
</div>
@@ -286,7 +286,7 @@ protected function extra_tablenav( $which ) {
* @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
*/
do_action( 'restrict_manage_users', $which );
?>
?>
</div>
<?php
/**
@@ -318,7 +318,7 @@ function post_submit_meta_box( $post, $args = array() ) {
<?php else : ?>
<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e( 'Publish' ); ?>" />
<?php submit_button( __( 'Publish' ), 'primary large', 'publish', false ); ?>
<?php
<?php
endif;
else :
?>
@@ -998,11 +998,11 @@ function confirm_delete_users( $users ) {
<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
<?php else : ?>
<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
<?php
<?php
endif;
submit_button( __( 'Confirm Deletion' ), 'primary' );
?>
?>
</form>
<?php
return true;
@@ -696,10 +696,10 @@ function install_plugin_information() {
?>
<p aria-hidden="true" class="fyi-description"><?php printf( _n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ), number_format_i18n( $api->num_ratings ) ); ?></p>
<?php
}
}
if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
?>
if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
?>
<h3><?php _e( 'Reviews' ); ?></h3>
<p class="fyi-description"><?php _e( 'Read all reviews on Worndpress.org or write your own!' ); ?></p>
<?php
@@ -727,9 +727,9 @@ function install_plugin_information() {
</div>
<?php
}
}
if ( ! empty( $api->contributors ) ) {
?>
}
if ( ! empty( $api->contributors ) ) {
?>
<h3><?php _e( 'Contributors' ); ?></h3>
<ul class="contributors">
<?php
@@ -747,10 +747,10 @@ function install_plugin_information() {
}
?>
</ul>
<?php if ( ! empty( $api->donate_link ) ) { ?>
<?php if ( ! empty( $api->donate_link ) ) { ?>
<a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a>
<?php } ?>
<?php } ?>
<?php } ?>
</div>
<div id="section-holder" class="wrap">
<?php
@@ -1732,16 +1732,16 @@ function _admin_notice_post_locked() {
<?php if ( $preview_link ) { ?>
<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e( 'Preview' ); ?></a>
<?php
}
}
// Allow plugins to prevent some users overriding the post lock
if ( $override ) {
?>
if ( $override ) {
?>
<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e( 'Take over' ); ?></a>
<?php
}
}
?>
?>
</p>
</div>
<?php

0 comments on commit 053616a

Please sign in to comment.
You can’t perform that action at this time.