Skip to content
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

Fix slug behaviour #575

Merged
merged 3 commits into from
Mar 18, 2020
Merged

Fix slug behaviour #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f08c7d
Correct file permissions
cojennin Feb 4, 2020
419d1fa
Ensure post_name is set/unset given context of request
cojennin Dec 18, 2019
5947275
Merge branch 'master' into fix/post-slug-editable-v2
cojennin Mar 17, 2020
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
Empty file modified bin/prepare-svn-release.sh
100644 → 100755
View file
Open in desktop
Empty file.
196 changes: 78 additions & 118 deletions modules/custom-status/custom-status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ function init() {
// These seven-ish methods are hacks for fixing bugs in WordPress core
add_action( 'admin_init', array( $this, 'check_timestamp_on_publish' ) );
add_filter( 'wp_insert_post_data', array( $this, 'fix_custom_status_timestamp' ), 10, 2 );
add_action( 'wp_insert_post', array( $this, 'fix_post_name' ), 10, 2 );
add_filter( 'wp_insert_post_data', array( $this, 'maybe_keep_post_name_empty' ), 10, 2 );
add_filter( 'pre_wp_unique_post_slug', array( $this, 'fix_unique_post_slug' ), 10, 6 );
add_filter( 'preview_post_link', array( $this, 'fix_preview_link_part_one' ) );
add_filter( 'post_link', array( $this, 'fix_preview_link_part_two' ), 10, 3 );
add_filter( 'page_link', array( $this, 'fix_preview_link_part_two' ), 10, 3 );
Expand Down Expand Up @@ -1367,41 +1368,66 @@ function fix_custom_status_timestamp( $data, $postarr ) {
}

/**
* Another hack! hack! hack! until core better supports custom statuses`
* A new hack! hack! hack! until core better supports custom statuses`
*
* @since 0.7.4
* @since 0.9.4
*
* Keep the post_name value empty for posts with custom statuses
* Unless they've set it customly
* If the post_name is set, set it, otherwise keep it empty
*
* @see https://github.com/Automattic/Edit-Flow/issues/123
* @see http://core.trac.wordpress.org/browser/tags/3.4.2/wp-includes/post.php#L2530
* @see http://core.trac.wordpress.org/browser/tags/3.4.2/wp-includes/post.php#L2646
*/
public function fix_post_name( $post_id, $post ) {
global $pagenow;
public function maybe_keep_post_name_empty( $data, $postarr ) {
$status_slugs = wp_list_pluck( $this->get_custom_statuses(), 'slug' );

/*
* Filters the $post object that will be modified
*
* @param $post WP_Post Post object being processed.
*/
$post = apply_filters( 'ef_fix_post_name_post', $post );
// Ignore if it's not a post status and post type we support
if ( ! in_array( $data['post_status'], $status_slugs )
|| ! in_array( $data['post_type'], $this->get_post_types_for_module( $this->module ) ) ) {
return $data;
}

// Only modify if we're using a pre-publish status on a supported custom post type
// If the post_name was intentionally set, set the post_name
if ( ! empty( $postarr['post_name'] ) ) {
$data['post_name'] = $postarr['post_name'];
return $data;
}

// Otherwise, keep the post_name empty
$data['post_name'] = '';

return $data;
}

/**
* A new hack! hack! hack! until core better supports custom statuses`
*
* @since 0.9.4
*
* `wp_unique_post_slug` is used to set the `post_name`. When a custom status is used, WordPress will try
* really hard to set `post_name`, and we leverage `wp_unique_post_slug` to prevent it being set
*
* @see: https://github.com/WordPress/WordPress/blob/396647666faebb109d9cd4aada7bb0c7d0fb8aca/wp-includes/post.php#L3932
*/
public function fix_unique_post_slug( $override_slug, $slug, $post_ID, $post_status, $post_type, $post_parent ) {
$status_slugs = wp_list_pluck( $this->get_custom_statuses(), 'slug' );
if ( 'post.php' != $pagenow
|| ! in_array( $post->post_status, $status_slugs )
|| ! in_array( $post->post_type, $this->get_post_types_for_module( $this->module ) ) )
return;

// The slug has been set by the meta box
if ( ! empty( $_POST['post_name'] ) )
return;
if ( ! in_array( $post_status, $status_slugs )
|| ! in_array( $post_type, $this->get_post_types_for_module( $this->module ) ) ) {
return null;
}

global $wpdb;
$post = get_post( $post_ID );

if ( empty( $post ) ) {
return null;
}

$wpdb->update( $wpdb->posts, array( 'post_name' => '' ), array( 'ID' => $post_id ) );
clean_post_cache( $post_id );
if ( $post->post_name ) {
return $slug;
}

return '';
}


Expand Down Expand Up @@ -1509,49 +1535,30 @@ public function fix_preview_link_part_three( $preview_link, $query_args ) {
* @return string $link Direct link to complete the action
*/
public function fix_get_sample_permalink( $permalink, $post_id, $title, $name, $post ) {
//Should we be doing anything at all?
if( !in_array( $post->post_type, $this->get_post_types_for_module( $this->module ) ) )
return $permalink;

//Is this published?
if( in_array( $post->post_status, $this->published_statuses ) )
return $permalink;
$status_slugs = wp_list_pluck( $this->get_custom_statuses(), 'slug' );

//Are we overriding the permalink? Don't do anything
if( isset( $_POST['action'] ) && $_POST['action'] == 'sample-permalink' )
if ( ! in_array( $post->post_status, $status_slugs )
|| ! in_array( $post->post_type, $this->get_post_types_for_module( $this->module ) ) ) {
return $permalink;
}

list( $permalink, $post_name ) = $permalink;

$post_name = $post->post_name ? $post->post_name : sanitize_title( $post->post_title );
$post->post_name = $post_name;

$ptype = get_post_type_object( $post->post_type );

if ( $ptype->hierarchical ) {
$post->filter = 'sample';
remove_filter( 'get_sample_permalink', array( $this, 'fix_get_sample_permalink' ), 10, 5 );

$uri = get_page_uri( $post->ID ) . $post_name;
$new_name = ! is_null( $name ) ? $name : $post->post_name;
$new_title = ! is_null( $title ) ? $title : $post->post_title;

if ( $uri ) {
$uri = untrailingslashit($uri);
$uri = strrev( stristr( strrev( $uri ), '/' ) );
$uri = untrailingslashit($uri);
}
$post = get_post( $post_id );
$status_before = $post->post_status;
$post->post_status = 'draft';

/** This filter is documented in wp-admin/edit-tag-form.php */
$uri = apply_filters( 'editable_slug', $uri, $post );
$permalink = get_sample_permalink( $post, $title, sanitize_title( $new_name ? $new_name : $new_title, $post->ID ) );

if ( !empty($uri) ) {
$uri .= '/';
}
$post->post_status = $status_before;

$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
}

unset($post->post_name);
add_filter( 'get_sample_permalink', array( $this, 'fix_get_sample_permalink' ), 10, 5 );

return array( $permalink, $post_name );
return $permalink;
}

/**
Expand All @@ -1566,75 +1573,28 @@ public function fix_get_sample_permalink( $permalink, $post_id, $title, $name, $
*
* @since 0.8.2
*
* @param string $return Sample permalink HTML markup
* @param int $post_id Post ID
* @param string $new_title New sample permalink title
* @param string $new_slug New sample permalink kslug
* @param WP_Post $post Post object
* @param string $return Sample permalink HTML markup.
* @param int $post_id Post ID.
* @param string $new_title New sample permalink title.
* @param string $new_slug New sample permalink slug.
* @param WP_Post $post Post object.
*/
function fix_get_sample_permalink_html( $return, $post_id, $new_title, $new_slug, $post ) {
public function fix_get_sample_permalink_html( $permalink, $post_id, $new_title, $new_slug, $post ) {
$status_slugs = wp_list_pluck( $this->get_custom_statuses(), 'slug' );

list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);

$view_link = false;
$preview_target = '';

if ( current_user_can( 'read_post', $post_id ) ) {
if ( in_array( $post->post_status, $status_slugs ) ) {
$view_link = $this->get_preview_link( $post );
$preview_target = " target='wp-preview-{$post->ID}'";
} else {
if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
$view_link = get_permalink( $post );
} else {
// Allow non-published (private, future) to be viewed at a pretty permalink.
$view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
}
}
if ( ! in_array( $post->post_status, $status_slugs )
|| ! in_array( $post->post_type, $this->get_post_types_for_module( $this->module ) ) ) {
return $permalink;
}

// Permalinks without a post/page name placeholder don't have anything to edit
if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";

if ( false !== $view_link ) {
$display_link = urldecode( $view_link );
$return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a>\n";
} else {
$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
}

// Encourage a pretty permalink setting
if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
}
} else {
if ( function_exists( 'mb_strlen' ) ) {
if ( mb_strlen( $post_name ) > 34 ) {
$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
} else {
$post_name_abridged = $post_name;
}
} else {
if ( strlen( $post_name ) > 34 ) {
$post_name_abridged = substr( $post_name, 0, 16 ) . '&hellip;' . substr( $post_name, -16 );
} else {
$post_name_abridged = $post_name;
}
}
remove_filter( 'get_sample_permalink_html', array( $this, 'fix_get_sample_permalink_html' ), 10, 5 );

$post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
$post->post_status = 'draft';
$sample_permalink_html = get_sample_permalink_html( $post, $new_title, $new_slug );

$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
}
add_filter( 'get_sample_permalink_html', array( $this, 'fix_get_sample_permalink_html' ), 10, 5 );

return $return;
return $sample_permalink_html;
}


Expand Down
Loading