Skip to content

Remove meta keywords functionality #8764

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
andizer merged 4 commits into from
Jan 29, 2018
Merged

Remove meta keywords functionality #8764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9130eb
Remove meta keywords functionality, fixes #8753
Jan 26, 2018
e953646
Remove noindex subpages feature, remove more metakeywords stuff, add …
Jan 26, 2018
a5b8b5f
Fix codestyle
Jan 29, 2018
b9d60ba
Small improvement
Jan 29, 2018
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
1 change: 0 additions & 1 deletion admin/class-admin-user-profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public function process_user_option_update( $user_id ) {

update_user_meta( $user_id, 'wpseo_title', $this->filter_input_post( 'wpseo_author_title' ) );
update_user_meta( $user_id, 'wpseo_metadesc', $this->filter_input_post( 'wpseo_author_metadesc' ) );
update_user_meta( $user_id, 'wpseo_metakey', $this->filter_input_post( 'wpseo_author_metakey' ) );
update_user_meta( $user_id, 'wpseo_excludeauthorsitemap', $this->filter_input_post( 'wpseo_author_exclude' ) );
update_user_meta( $user_id, 'wpseo_content_analysis_disable', $this->filter_input_post( 'wpseo_content_analysis_disable' ) );
update_user_meta( $user_id, 'wpseo_keyword_analysis_disable', $this->filter_input_post( 'wpseo_keyword_analysis_disable' ) );
Expand Down
17 changes: 0 additions & 17 deletions admin/metabox/class-metabox.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ public static function translate_meta_boxes() {

self::$meta_fields['general']['metadesc']['title'] = __( 'Meta description', 'wordpress-seo' );

self::$meta_fields['general']['metakeywords']['title'] = __( 'Meta keywords', 'wordpress-seo' );
self::$meta_fields['general']['metakeywords']['label'] = __( 'Enter the meta keywords', 'wordpress-seo' );
/* translators: 1: link open tag; 2: link close tag. */
self::$meta_fields['general']['metakeywords']['description'] = __( 'If you type something above it will override your %1$smeta keywords template%2$s.', 'wordpress-seo' );


self::$meta_fields['advanced']['meta-robots-noindex']['title'] = __( 'Meta robots index', 'wordpress-seo' );
if ( '0' === (string) get_option( 'blog_public' ) ) {
self::$meta_fields['advanced']['meta-robots-noindex']['description'] = '<p class="error-message">' . __( 'Warning: even though you can set the meta robots setting here, the entire site is set to noindex in the sitewide privacy settings, so these settings won\'t have an effect.', 'wordpress-seo' ) . '</p>';
Expand Down Expand Up @@ -615,16 +609,6 @@ public function do_meta_box( $meta_field_def, $key = '' ) {
$content .= '</section>';
$content .= '</div>';
break;
case 'metakeywords':
$content .= '<div id="wpseometakeywords">';
$content .= '<section class="yoast-section" id="wpseo-metakeywords-section">';
$content .= '<h3 class="yoast-section__heading yoast-section__heading-icon yoast-section__heading-icon-edit">' . esc_html( $meta_field_def['title'] ) . '</h3>';
$content .= '<label for="' . $esc_form_key . '" class="screen-reader-text">' . esc_html( $meta_field_def['label'] ) . '</label>';
$content .= '<input type="text" id="' . $esc_form_key . '" name="' . $esc_form_key . '" value="' . esc_attr( $meta_value ) . '" class="large-text' . $class . '"' . $aria_describedby . '/>';
$content .= $description;
$content .= '</section>';
$content .= '</div>';
break;
case 'text':
$ac = '';
if ( isset( $meta_field_def['autocomplete'] ) && $meta_field_def['autocomplete'] === false ) {
Expand Down Expand Up @@ -749,7 +733,6 @@ public function do_meta_box( $meta_field_def, $key = '' ) {
'snippetpreview',
'pageanalysis',
'focuskeyword',
'metakeywords',
), true )
) {
return $this->create_content_box( $content, $meta_field_def['type'], $help_button, $help_panel );
Expand Down
1 change: 0 additions & 1 deletion admin/pages/metas.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
$tabs->add_tab( new WPSEO_Option_Tab( 'post-types', __( 'Post Types', 'wordpress-seo' ), array( 'video_url' => WPSEO_Shortlinker::get( 'https://yoa.st/screencast-metas-post-types' ) ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'taxonomies', __( 'Taxonomies', 'wordpress-seo' ), array( 'video_url' => WPSEO_Shortlinker::get( 'https://yoa.st/screencast-metas-taxonomies' ) ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'archives', __( 'Archives', 'wordpress-seo' ), array( 'video_url' => WPSEO_Shortlinker::get( 'https://yoa.st/screencast-metas-archives' ) ) ) );
$tabs->add_tab( new WPSEO_Option_Tab( 'other', __( 'Other', 'wordpress-seo' ), array( 'video_url' => WPSEO_Shortlinker::get( 'https://yoa.st/screencast-metas-other' ) ) ) );
$tabs->display( $yform, $options );

$yform->admin_footer();
Expand Down
7 changes: 0 additions & 7 deletions admin/taxonomy/class-taxonomy-settings-fields.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ public function __construct( $term ) {
*/
public function get() {
$fields = array(
'metakey' => $this->get_field_config(
__( 'Meta keywords', 'wordpress-seo' ),
esc_html__( 'Meta keywords used on the archive page for this term.', 'wordpress-seo' ),
'text',
'',
$this->options['usemetakeywords'] !== true
),
'noindex' => $this->get_field_config(
esc_html__( 'Meta robots index', 'wordpress-seo' ),
esc_html__( 'This taxonomy follows the indexation rules set under Metas and Titles, you can override it here.', 'wordpress-seo' ),
Expand Down
3 changes: 0 additions & 3 deletions admin/views/tabs/metas/archives.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
echo "<div id='author-archives-titles-metas-content' class='archives-titles-metas-content'>";
$yform->textinput( 'title-author-wpseo', __( 'Title template', 'wordpress-seo' ), 'template author-template' );
$yform->textarea( 'metadesc-author-wpseo', __( 'Meta description template', 'wordpress-seo' ), array( 'class' => 'template author-template' ) );
if ( $options['usemetakeywords'] === true ) {
$yform->textinput( 'metakey-author-wpseo', __( 'Meta keywords template', 'wordpress-seo' ) );
}
$yform->toggle_switch( 'noindex-author-wpseo', $index_switch_values, __( 'Meta Robots', 'wordpress-seo' ) );
echo '</div>';
echo '</div>';
Expand Down
3 changes: 0 additions & 3 deletions admin/views/tabs/metas/home.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
echo '<h2>', esc_html__( 'Homepage', 'wordpress-seo' ), '</h2>';
$yform->textinput( 'title-home-wpseo', __( 'Title template', 'wordpress-seo' ), 'template homepage-template' );
$yform->textarea( 'metadesc-home-wpseo', __( 'Meta description template', 'wordpress-seo' ), array( 'class' => 'template homepage-template' ) );
if ( $options['usemetakeywords'] === true ) {
$yform->textinput( 'metakey-home-wpseo', __( 'Meta keywords template', 'wordpress-seo' ) );
}
echo '</div>';
}
else {
Expand Down
18 changes: 0 additions & 18 deletions admin/views/tabs/metas/other.php
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions admin/views/tabs/metas/post-types.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
}
$yform->textinput( 'title-' . $name, __( 'Title template', 'wordpress-seo' ), 'template posttype-template' );
$yform->textarea( 'metadesc-' . $name, __( 'Meta description template', 'wordpress-seo' ), array( 'class' => 'template posttype-template' ) );
if ( $options['usemetakeywords'] === true ) {
$yform->textinput( 'metakey-' . $name, __( 'Meta keywords template', 'wordpress-seo' ) );
}
$yform->toggle_switch( 'noindex-' . $name, $index_switch_values, __( 'Meta Robots', 'wordpress-seo' ) );
$yform->toggle_switch( 'showdate-' . $name, array(
'on' => __( 'Show', 'wordpress-seo' ),
Expand Down Expand Up @@ -80,9 +77,6 @@
echo '<h3>' . esc_html( ucfirst( $post_type->labels->name ) ) . '</h3>';
$yform->textinput( 'title-ptarchive-' . $name, __( 'Title', 'wordpress-seo' ), 'template posttype-template' );
$yform->textarea( 'metadesc-ptarchive-' . $name, __( 'Meta description', 'wordpress-seo' ), array( 'class' => 'template posttype-template' ) );
if ( $options['usemetakeywords'] === true ) {
$yform->textinput( 'metakey-ptarchive-' . $name, __( 'Meta keywords', 'wordpress-seo' ) );
}
if ( $options['breadcrumbs-enable'] === true ) {
$yform->textinput( 'bctitle-ptarchive-' . $name, __( 'Breadcrumbs title', 'wordpress-seo' ) );
}
Expand Down
3 changes: 0 additions & 3 deletions admin/views/tabs/metas/taxonomies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
echo "<div id='" . esc_attr( $tax->name ) . "-titles-metas'>";
$yform->textinput( 'title-tax-' . $tax->name, __( 'Title template', 'wordpress-seo' ), 'template taxonomy-template' );
$yform->textarea( 'metadesc-tax-' . $tax->name, __( 'Meta description template', 'wordpress-seo' ), array( 'class' => 'template taxonomy-template' ) );
if ( $options['usemetakeywords'] === true ) {
$yform->textinput( 'metakey-tax-' . $tax->name, __( 'Meta keywords template', 'wordpress-seo' ) );
}
$yform->toggle_switch( 'noindex-tax-' . $tax->name, $index_switch_values, __( 'Meta Robots', 'wordpress-seo' ) );
if ( $tax->name !== 'post_format' ) {
/* translators: %1$s expands to Yoast SEO */
Expand Down
6 changes: 0 additions & 6 deletions admin/views/user-profile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
<textarea rows="5" cols="30" id="wpseo_author_metadesc" class="yoast-settings__textarea yoast-settings__textarea--medium"
name="wpseo_author_metadesc"><?php echo esc_textarea( get_the_author_meta( 'wpseo_metadesc', $user->ID ) ); ?></textarea><br>

<?php if ( $options_titles['usemetakeywords'] === true ) { ?>
<label for="wpseo_author_metakey"><?php esc_html_e( 'Meta keywords to use for Author page', 'wordpress-seo' ); ?></label>
<input class="yoast-settings__text regular-text" type="text" id="wpseo_author_metakey"
name="wpseo_author_metakey"
value="<?php echo esc_attr( get_the_author_meta( 'wpseo_metakey', $user->ID ) ); ?>"/><br>
<?php } ?>
<input class="yoast-settings__checkbox double" type="checkbox" id="wpseo_author_exclude"
name="wpseo_author_exclude"
value="on" <?php echo ( get_the_author_meta( 'wpseo_excludeauthorsitemap', $user->ID ) === 'on' ) ? 'checked' : ''; ?> />
Expand Down
20 changes: 19 additions & 1 deletion css/dist/admin-global-620-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,28 @@ td.column-wpseo-linked {
display: none;
}

.contact-premium-support-container {
.contact-premium-support {
text-align: center;
}

.contact-premium-support__content {
margin: 0 auto 1.5em;
font-size: 0.9375rem;
line-height: 1.4;
}

.contact-premium-support__content:nth-child(2) {
max-width: 610px;
}

.contact-premium-support__content:nth-child(3) {
max-width: 560px;
}

.contact-premium-support .contact-premium-support__button {
margin-bottom: 48px;
}

.wpseo-premium-description {
margin-top: 0.5em;
}
Expand Down
2 changes: 1 addition & 1 deletion css/dist/admin-global-620-rtl.min.css
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 19 additions & 1 deletion css/dist/admin-global-620.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,10 +585,28 @@ td.column-wpseo-linked {
display: none;
}

.contact-premium-support-container {
.contact-premium-support {
text-align: center;
}

.contact-premium-support__content {
margin: 0 auto 1.5em;
font-size: 0.9375rem;
line-height: 1.4;
}

.contact-premium-support__content:nth-child(2) {
max-width: 610px;
}

.contact-premium-support__content:nth-child(3) {
max-width: 560px;
}

.contact-premium-support .contact-premium-support__button {
margin-bottom: 48px;
}

.wpseo-premium-description {
margin-top: 0.5em;
}
Expand Down
2 changes: 1 addition & 1 deletion css/dist/admin-global-620.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions css/dist/metabox-620-rtl.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,7 @@ ul.wpseo-metabox-tabs li .wpseo-keyword {

/* Content tab. */
#wpseosnippet,
#wpseofocuskeyword,
#wpseometakeywords {
#wpseofocuskeyword {
margin-bottom: 2em;
}

Expand Down Expand Up @@ -1252,7 +1251,6 @@ ul.wpseo-metabox-tabs li .wpseo-keyword {
}

.wpseotab #yoast_wpseo_focuskw_text_input,
.wpseotab #yoast_wpseo_metakeywords,
.wpseotab select[multiple] {
margin-top: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion css/dist/metabox-620-rtl.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions css/dist/metabox-620.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,8 +1124,7 @@ ul.wpseo-metabox-tabs li .wpseo-keyword {

/* Content tab. */
#wpseosnippet,
#wpseofocuskeyword,
#wpseometakeywords {
#wpseofocuskeyword {
margin-bottom: 2em;
}

Expand Down Expand Up @@ -1252,7 +1251,6 @@ ul.wpseo-metabox-tabs li .wpseo-keyword {
}

.wpseotab #yoast_wpseo_focuskw_text_input,
.wpseotab #yoast_wpseo_metakeywords,
.wpseotab select[multiple] {
margin-top: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion css/dist/metabox-620.min.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions css/src/metabox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ ul.wpseo-metabox-tabs li {

/* Content tab. */
#wpseosnippet,
#wpseofocuskeyword,
#wpseometakeywords {
#wpseofocuskeyword {
margin-bottom: 2em;
}

Expand Down Expand Up @@ -291,7 +290,6 @@ ul.wpseo-metabox-tabs li {
}

.wpseotab #yoast_wpseo_focuskw_text_input,
.wpseotab #yoast_wpseo_metakeywords,
.wpseotab select[multiple] {
margin-top: 0;
}
Expand Down
Loading