Skip to content

Commit

Permalink
fix date archive redirect notice
Browse files Browse the repository at this point in the history
  • Loading branch information
RavanH committed Apr 6, 2019
1 parent 728220b commit 7392b05
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions controllers/admin/sitemap.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public function check_plugin_conflicts()
if ( !empty( $wpseo_titles['disable-date'] ) ) {
// check if Split by option is set anywhere
foreach ( (array) get_option( 'xmlsf_post_types', array() ) as $type => $settings ) {
if ( is_array( $settings ) && !empty( $settings['archive'] ) ) {
if ( !empty( $settings['active'] ) && !empty( $settings['archive'] ) ) {
add_action( 'admin_notices', array( 'XMLSF_Admin_Notices', 'notice_wpseo_date_redirect' ) );
break;
}
Expand All @@ -112,7 +112,7 @@ public function check_plugin_conflicts()
if ( ! empty( $seopress_toggle['toggle-titles'] ) && ! empty( $seopress_titles['seopress_titles_archives_date_disable'] ) ) {
// check if Split by option is set anywhere
foreach ( (array) get_option( 'xmlsf_post_types', array() ) as $type => $settings ) {
if ( is_array( $settings ) && !empty( $settings['archive'] ) ) {
if ( !empty( $settings['active'] ) && !empty( $settings['archive'] ) ) {
add_action( 'admin_notices', array( 'XMLSF_Admin_Notices', 'notice_seopress_date_redirect' ) );
break;
}
Expand Down
6 changes: 4 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,16 @@ Yes. In fact, it has been designed for it. Tested on WPMU 2.9.2 and WPMS 3+ both

== Upgrade Notice ==

= 5.1.1 =
= 5.1.2 =

Bugfix release: options page and news pings.
Bugfix release.


== Changelog ==

= 5.1.2 =
* FIX: admin notice dismiss button failing
* FIX: date archive redirect notice showing for inactive post types
* Plugin support and rate links on plugins page

= 5.1.1 =
Expand Down
4 changes: 2 additions & 2 deletions xml-sitemap.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
Plugin Name: XML Sitemap & Google News
Plugin URI: http://status301.net/wordpress-plugins/xml-sitemap-feed/
Description: Feed the hungry spiders in compliance with the XML Sitemap and Google News protocols. Happy with the results? Please leave me a <strong><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=ravanhagen%40gmail%2ecom&item_name=XML%20Sitemap%20Feed">tip</a></strong> for continued development and support. Thanks :)
Version: 5.1.2-alpha
Version: 5.1.2
Text Domain: xml-sitemap-feed
Requires at least: 4.6
Requires PHP: 5.4
Author: RavanH
Author URI: http://status301.net/
*/

define( 'XMLSF_VERSION', '5.1.1' );
define( 'XMLSF_VERSION', '5.1.2' );

/* Copyright 2019 RavanH
http://status301.net/
Expand Down

0 comments on commit 7392b05

Please sign in to comment.