Skip to content

Replace hardcoded 'author' with $this->$coauthor_taxonomy #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 17, 2017
Merged

Replace hardcoded 'author' with $this->$coauthor_taxonomy #426

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e7da2b
Removed duplicate left join for optimization
May 30, 2017
1387ae1
Merge branch 'master' of https://github.com/Automattic/Co-Authors-Plus
May 30, 2017
f759744
Fixed WP CLI create-terms-for-posts if no co-authors found
May 30, 2017
76c59ef
Revert "Fixed WP CLI create-terms-for-posts if no co-authors found"
May 30, 2017
9f8a1d5
Revert "Removed duplicate left join for optimization"
May 30, 2017
8ab4751
Merge remote-tracking branch 'upstream/master'
May 30, 2017
84d8394
replaced hardcoded 'author' with $this->coauthor_taxonomy
Jun 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions co-authors-plus.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function action_init_late() {

$post_types_with_authors = array_values( get_post_types() );
foreach ( $post_types_with_authors as $key => $name ) {
if ( ! post_type_supports( $name, 'author' ) || in_array( $name, array( 'revision', 'attachment' ) ) ) {
if ( ! post_type_supports( $name, $this->coauthor_taxonomy ) || in_array( $name, array( 'revision', 'attachment' ) ) ) {
unset( $post_types_with_authors[ $key ] );
}
}
Expand Down Expand Up @@ -401,7 +401,7 @@ function remove_quick_edit_authors_box() {
global $pagenow;

if ( 'edit.php' == $pagenow && $this->is_post_type_enabled() ) {
remove_post_type_support( get_post_type(), 'author' );
remove_post_type_support( get_post_type(), $this->coauthor_taxonomy );
}
}

Expand All @@ -423,7 +423,7 @@ function _filter_manage_posts_columns( $posts_columns ) {
$new_columns['coauthors'] = __( 'Authors', 'co-authors-plus' );
}

if ( 'author' === $key ) {
if ( $this->coauthor_taxonomy === $key ) {
unset( $new_columns[ $key ] );
}
}
Expand Down Expand Up @@ -649,7 +649,7 @@ function posts_where_filter( $where, $query ) {
if ( $query->get( 'author_name' ) ) {
$author_name = sanitize_title( $query->get( 'author_name' ) );
} else {
$author_data = get_userdata( $query->get( 'author' ) );
$author_data = get_userdata( $query->get( $this->coauthor_taxonomy ) );
if ( is_object( $author_data ) ) {
$author_name = $author_data->user_nicename;
} else {
Expand Down Expand Up @@ -898,8 +898,7 @@ function delete_user_action( $delete_id ) {
* @props kingkool68, http://wordpress.org/support/topic/plugin-co-authors-plus-making-authors-sortable
*/
function filter_wp_get_object_terms( $terms, $object_ids, $taxonomies, $args ) {

if ( ! isset( $_REQUEST['bulk_edit'] ) || "'author'" !== $taxonomies ) {
if ( ! isset( $_REQUEST['bulk_edit'] ) || $this->coauthor_taxonomy !== $taxonomies ) {
return $terms;
}

Expand Down Expand Up @@ -1048,7 +1047,7 @@ public function filter_infinite_scroll_js_settings( $settings ) {
$author = get_queried_object();

if ( $author && 'guest-author' == $author->type ) {
unset( $settings['query_args']['author'] );
unset( $settings['query_args'][$this->coauthor_taxonomy] );

$settings['query_args']['author_name'] = $author->user_nicename;
}
Expand Down Expand Up @@ -1397,19 +1396,19 @@ public function update_author_term( $coauthor ) {
function filter_ef_calendar_item_information_fields( $information_fields, $post_id ) {

// Don't add the author row again if another plugin has removed
if ( ! array_key_exists( 'author', $information_fields ) ) {
if ( ! array_key_exists( $this->coauthor_taxonomy, $information_fields ) ) {
return $information_fields;
}

$co_authors = get_coauthors( $post_id );
if ( count( $co_authors ) > 1 ) {
$information_fields['author']['label'] = __( 'Authors', 'co-authors-plus' );
$information_fields[$this->coauthor_taxonomy]['label'] = __( 'Authors', 'co-authors-plus' );
}
$co_authors_names = '';
foreach ( $co_authors as $co_author ) {
$co_authors_names .= $co_author->display_name . ', ';
}
$information_fields['author']['value'] = rtrim( $co_authors_names, ', ' );
$information_fields[$this->coauthor_taxonomy]['value'] = rtrim( $co_authors_names, ', ' );
return $information_fields;
}

Expand All @@ -1426,7 +1425,7 @@ function filter_ef_calendar_item_information_fields( $information_fields, $post_
function filter_ef_story_budget_term_column_value( $column_name, $post, $parent_term ) {

// We only want to modify the 'author' column
if ( 'author' != $column_name ) {
if ( $this->coauthor_taxonomy != $column_name ) {
return $column_name;
}

Expand Down