XML Sitemap & Google News feeds - Version 5.2.4

Version Description

Bugfixes + Rank Math compatibility warnings.

=

Download this release

Release Info

Developer deployer
Plugin Icon 128x128 XML Sitemap & Google News feeds
Version 5.2.4
Comparing to
See all releases

Code changes from version 5.2.3 to 5.2.4

Files changed (54) hide show
  1. controllers/class.xmlsf-admin-notices.php +10 -0
  2. controllers/class.xmlsf-admin-sitemap.php +30 -1
  3. models/class-xmlsitemapfeed.php +0 -0
  4. readme.txt +8 -3
  5. uninstall.php +0 -0
  6. views/_generator.php +0 -0
  7. views/_usage.php +0 -0
  8. views/admin/field-news-categories.php +0 -0
  9. views/admin/field-news-labels.php +0 -0
  10. views/admin/field-news-name.php +0 -0
  11. views/admin/field-news-post-type.php +0 -0
  12. views/admin/field-ping.php +0 -0
  13. views/admin/field-robots.php +0 -0
  14. views/admin/field-sitemap-custom.php +0 -0
  15. views/admin/field-sitemap-domains.php +0 -0
  16. views/admin/field-sitemap-post-type.php +0 -0
  17. views/admin/field-sitemap-taxonomies.php +0 -0
  18. views/admin/field-sitemap-taxonomy-settings.php +0 -0
  19. views/admin/field-sitemap-urls.php +0 -0
  20. views/admin/field-sitemaps.php +0 -0
  21. views/admin/help-tab-advanced.php +0 -0
  22. views/admin/help-tab-allowed-domains.php +0 -0
  23. views/admin/help-tab-news-categories.php +0 -0
  24. views/admin/help-tab-news-labels.php +0 -0
  25. views/admin/help-tab-news-name.php +0 -0
  26. views/admin/help-tab-news-sidebar.php +0 -0
  27. views/admin/help-tab-news.php +0 -0
  28. views/admin/help-tab-ping.php +0 -0
  29. views/admin/help-tab-post-types.php +0 -0
  30. views/admin/help-tab-robots.php +0 -0
  31. views/admin/help-tab-sidebar.php +0 -0
  32. views/admin/help-tab-sitemaps.php +0 -0
  33. views/admin/help-tab-support.php +0 -0
  34. views/admin/help-tab-taxonomies.php +0 -0
  35. views/admin/meta-box-news.php +0 -0
  36. views/admin/meta-box.php +0 -0
  37. views/admin/notice-rankmath-date-redirect.php +26 -0
  38. views/admin/notice-rankmath-sitemap.php +25 -0
  39. views/admin/notice-seopress-date-redirect.php +16 -13
  40. views/admin/notice-seopress-sitemap.php +15 -12
  41. views/admin/notice-static-files.php +0 -0
  42. views/admin/notice-wpseo-date-redirect.php +7 -4
  43. views/admin/notice-wpseo-sitemap.php +15 -12
  44. views/admin/page-sitemap-news.php +0 -0
  45. views/admin/page-sitemap.php +0 -0
  46. views/admin/sidebar-contribute.php +0 -0
  47. views/admin/sidebar-help.php +0 -0
  48. views/feed-sitemap-custom.php +0 -0
  49. views/feed-sitemap-home.php +0 -0
  50. views/feed-sitemap-news.php +0 -0
  51. views/feed-sitemap-post_type.php +0 -4
  52. views/feed-sitemap-taxonomy.php +0 -0
  53. views/feed-sitemap.php +0 -0
  54. xml-sitemap.php +2 -2
controllers/class.xmlsf-admin-notices.php CHANGED
@@ -40,4 +40,14 @@ class XMLSF_Admin_Notices extends XMLSF_Admin
40
  {
41
  include XMLSF_DIR . '/views/admin/notice-seopress-sitemap.php';
42
  }
 
 
 
 
 
 
 
 
 
 
43
  }
40
  {
41
  include XMLSF_DIR . '/views/admin/notice-seopress-sitemap.php';
42
  }
43
+
44
+ public static function notice_rankmath_date_redirect()
45
+ {
46
+ include XMLSF_DIR . '/views/admin/notice-rankmath-date-redirect.php';
47
+ }
48
+
49
+ public static function notice_rankmath_sitemap()
50
+ {
51
+ include XMLSF_DIR . '/views/admin/notice-rankmath-sitemap.php';
52
+ }
53
  }
controllers/class.xmlsf-admin-sitemap.php CHANGED
@@ -68,8 +68,10 @@ class XMLSF_Admin_Sitemap extends XMLSF_Admin
68
  */
69
  public function check_plugin_conflicts()
70
  {
 
 
71
  // TODO:
72
- // W3TC static files 404 exclusion rules ? Said to be fixed in W3TC next veresion...
73
  // Google (XML) Sitemaps Generator Plugin for WordPress and Google News sitemap incompatibility
74
 
75
  // WP SEO conflict notices
@@ -123,6 +125,33 @@ class XMLSF_Admin_Sitemap extends XMLSF_Admin
123
  }
124
  }
125
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
126
  }
127
 
128
  /**
68
  */
69
  public function check_plugin_conflicts()
70
  {
71
+ if ( wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) return;
72
+
73
  // TODO:
74
+ // W3TC static files 404 exclusion rules ? Said to be fixed in W3TC next version...
75
  // Google (XML) Sitemaps Generator Plugin for WordPress and Google News sitemap incompatibility
76
 
77
  // WP SEO conflict notices
125
  }
126
  }
127
  }
128
+
129
+ // Rank Math conflict notices
130
+ if ( is_plugin_active('seo-by-rank-math/rank-math.php') ) {
131
+
132
+ // check date archive redirection
133
+ if ( !in_array( 'rankmath_date_redirect', parent::$dismissed ) ) {
134
+ $rankmath_titles = get_option( 'rank-math-options-titles' );
135
+ if ( ! empty( $rankmath_titles['disable_date_archives'] ) && $rankmath_titles['disable_date_archives'] == 'on' ) {
136
+ // check if Split by option is set anywhere
137
+ foreach ( (array) get_option( 'xmlsf_post_types', array() ) as $type => $settings ) {
138
+ if ( !empty( $settings['active'] ) && !empty( $settings['archive'] ) ) {
139
+ add_action( 'admin_notices', array( 'XMLSF_Admin_Notices', 'notice_rankmath_date_redirect' ) );
140
+ break;
141
+ }
142
+ }
143
+ }
144
+ }
145
+
146
+ // check rank math sitemap option
147
+ if ( !in_array( 'rankmath_sitemap', parent::$dismissed ) ) {
148
+ $rankmath_modules = (array) get_option( 'rank_math_modules' );
149
+ if ( in_array( 'sitemap', $rankmath_modules ) ) {
150
+ add_action( 'admin_notices', array( 'XMLSF_Admin_Notices', 'notice_rankmath_sitemap' ) );
151
+ }
152
+ }
153
+ }
154
+
155
  }
156
 
157
  /**
models/class-xmlsitemapfeed.php CHANGED
File without changes
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: sitemap, xml sitemap, news sitemap, sitemap.xml, robots.txt, Google, Googl
5
  Requires at least: 4.4
6
  Requires PHP: 5.4
7
  Tested up to: 5.2
8
- Stable tag: 5.2.3
9
 
10
  XML and Google News Sitemaps to feed the hungry spiders. Multisite, WP Super Cache, Polylang and WPML compatible.
11
 
@@ -291,13 +291,18 @@ Yes. In fact, it has been designed for it. Tested on WPMU 2.9.2 and WPMS 3+ both
291
 
292
  == Upgrade Notice ==
293
 
294
- = 5.2.3 =
295
 
296
- Bugfix release.
297
 
298
 
299
  == Changelog ==
300
 
 
 
 
 
 
301
  = 5.2.3 =
302
  * FIX Cannot use return value in write context
303
  * FIX issue #30 for sql_mode=ONLY_FULL_GROUP_BY, thanks @silvios
5
  Requires at least: 4.4
6
  Requires PHP: 5.4
7
  Tested up to: 5.2
8
+ Stable tag: 5.2.4
9
 
10
  XML and Google News Sitemaps to feed the hungry spiders. Multisite, WP Super Cache, Polylang and WPML compatible.
11
 
291
 
292
  == Upgrade Notice ==
293
 
294
+ = 5.2.4 =
295
 
296
+ Bugfixes + Rank Math compatibility warnings.
297
 
298
 
299
  == Changelog ==
300
 
301
+ = 5.2.4 =
302
+ * NEW Rank Math incompatibility admin warnings
303
+ * FIX undefined index
304
+ * FIX invalid form control
305
+
306
  = 5.2.3 =
307
  * FIX Cannot use return value in write context
308
  * FIX issue #30 for sql_mode=ONLY_FULL_GROUP_BY, thanks @silvios
uninstall.php CHANGED
File without changes
views/_generator.php CHANGED
File without changes
views/_usage.php CHANGED
File without changes
views/admin/field-news-categories.php CHANGED
File without changes
views/admin/field-news-labels.php CHANGED
File without changes
views/admin/field-news-name.php CHANGED
File without changes
views/admin/field-news-post-type.php CHANGED
File without changes
views/admin/field-ping.php CHANGED
File without changes
views/admin/field-robots.php CHANGED
File without changes
views/admin/field-sitemap-custom.php CHANGED
File without changes
views/admin/field-sitemap-domains.php CHANGED
File without changes
views/admin/field-sitemap-post-type.php CHANGED
File without changes
views/admin/field-sitemap-taxonomies.php CHANGED
File without changes
views/admin/field-sitemap-taxonomy-settings.php CHANGED
File without changes
views/admin/field-sitemap-urls.php CHANGED
File without changes
views/admin/field-sitemaps.php CHANGED
File without changes
views/admin/help-tab-advanced.php CHANGED
File without changes
views/admin/help-tab-allowed-domains.php CHANGED
File without changes
views/admin/help-tab-news-categories.php CHANGED
File without changes
views/admin/help-tab-news-labels.php CHANGED
File without changes
views/admin/help-tab-news-name.php CHANGED
File without changes
views/admin/help-tab-news-sidebar.php CHANGED
File without changes
views/admin/help-tab-news.php CHANGED
File without changes
views/admin/help-tab-ping.php CHANGED
File without changes
views/admin/help-tab-post-types.php CHANGED
File without changes
views/admin/help-tab-robots.php CHANGED
File without changes
views/admin/help-tab-sidebar.php CHANGED
File without changes
views/admin/help-tab-sitemaps.php CHANGED
File without changes
views/admin/help-tab-support.php CHANGED
File without changes
views/admin/help-tab-taxonomies.php CHANGED
File without changes
views/admin/meta-box-news.php CHANGED
File without changes
views/admin/meta-box.php CHANGED
File without changes
views/admin/notice-rankmath-date-redirect.php ADDED
@@ -0,0 +1,26 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <div class="notice notice-error fade is-dismissible">
2
+ <p>
3
+ <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
+ </p>
5
+ <p>
6
+ <?php printf( /* translators: conflicting plugin name */
7
+ __( 'A setting in the %s plugin causes all date based sitemaps to redirect to the main page.', 'xml-sitemap-feed'),
8
+ translate('Rank Math','rank-math')
9
+ ); ?>
10
+ <?php printf( /* translators: Date archives, Archives (linked to WP SEO plugin settings), Split by, None, Included post types (linked to Sitemap settings) */
11
+ __( 'Please either enable <strong>%1$s</strong> under %2$s in your SEO settings or set all <strong>%3$s</strong> options to <strong>%4$s</strong> under %5$s in your XML Sitemap settings.', 'xml-sitemap-feed'),
12
+ translate('Date Archives','rank-math'),
13
+ '<a href="' . admin_url('admin.php') . '?page=rank-math-options-titles#setting-panel-misc">' . translate('Misc Pages','rank-math') . '</a>',
14
+ __( 'Split by', 'xml-sitemap-feed' ),
15
+ translate('None'),
16
+ '<a href="' . admin_url('options-general.php') . '?page=xmlsf">' . __('Included post types','xml-sitemap-feed') . '</a>'
17
+ ); ?>
18
+ </p>
19
+ <form action="" method="post">
20
+ <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
21
+ <p>
22
+ <input type="hidden" name="xmlsf-dismiss" value="rankmath_date_redirect" />
23
+ <input type="submit" class="button button-small" name="xmlsf-dismiss-submit" value="<?php echo translate('Dismiss'); ?>" />
24
+ </p>
25
+ </form>
26
+ </div>
views/admin/notice-rankmath-sitemap.php ADDED
@@ -0,0 +1,25 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <div class="notice notice-error fade is-dismissible">
2
+ <p>
3
+ <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
+ </p>
5
+ <p>
6
+ <?php printf( /* translators: Conflicting Plugn name, Plugin name */
7
+ __( 'The %1$s XML Sitemap is not compatible with %2$s.', 'xml-sitemap-feed'),
8
+ translate('Rank Math','rank-math'),
9
+ __('XML Sitemap & Google News','xml-sitemap-feed')
10
+ ); ?>
11
+ <?php printf( /* translators: Sitemap page name (linked to SEOPress plugin settings), XML Sitemap Index, Reading Settings admin page (linked to Reading settings) */
12
+ __( 'Please either disable the XML Sitemap under %1$s in your SEO settings or disable the option %2$s on %3$s.', 'xml-sitemap-feed'),
13
+ '<a href="' . admin_url('admin.php') . '?page=rank-math&view=modules">' . translate('Modules','rank-math') . '</a>',
14
+ __('XML Sitemap Index','xml-sitemap-feed'),
15
+ '<a href="' . admin_url('options-reading.php') . '#xmlsf_sitemaps">' . translate('Reading Settings') . '</a>'
16
+ ); ?>
17
+ </p>
18
+ <form action="" method="post">
19
+ <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
20
+ <p>
21
+ <input type="hidden" name="xmlsf-dismiss" value="rankmath_sitemap" />
22
+ <input type="submit" class="button button-small" name="xmlsf-dismiss-submit" value="<?php echo translate('Dismiss'); ?>" />
23
+ </p>
24
+ </form>
25
+ </div>
views/admin/notice-seopress-date-redirect.php CHANGED
@@ -1,18 +1,21 @@
1
  <div class="notice notice-error fade is-dismissible">
2
  <p>
3
- <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
- </p>
5
- <p>
6
- <?php printf( /* translators: Date archives, Archives (linked to WP SEO plugin settings), Split by, None, Included post types (linked to Sitemap settings) */
7
- __( 'A setting in the SEOPress plugin causes all date based sitemaps to redirect to the main page. Please either enable <strong>%1$s</strong> under %2$s in your SEO settings or set all <strong>%3$s</strong> options to <strong>%4$s</strong> under %5$s in your XML Sitemap settings.', 'xml-sitemap-feed'),
8
- translate('Date archives','wp-seopress'),
9
- '<a href="' . admin_url('admin.php') . '?page=seopress-titles#tab=tab_seopress_titles_archives">' . translate('Archives','wp-seopress') . '</a>',
10
- __('Split by','xml-sitemap-feed'),
11
- translate('None'),
12
- '<a href="' . admin_url('options-general.php') . '?page=xmlsf">' . __('Included post types','xml-sitemap-feed') . '</a>'
13
- );
14
- ?>
15
- </p>
 
 
 
16
  <form action="" method="post">
17
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
18
  <p>
1
  <div class="notice notice-error fade is-dismissible">
2
  <p>
3
+ <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
+ </p>
5
+ <p>
6
+ <?php printf( /* translators: conflicting plugin name */
7
+ __( 'A setting in the %s plugin causes all date based sitemaps to redirect to the main page.', 'xml-sitemap-feed'),
8
+ translate('SEOPress','wp-seopress')
9
+ ); ?>
10
+ <?php printf( /* translators: Date archives, Archives (linked to WP SEO plugin settings), Split by, None, Included post types (linked to Sitemap settings) */
11
+ __( 'Please either enable <strong>%1$s</strong> under %2$s in your SEO settings or set all <strong>%3$s</strong> options to <strong>%4$s</strong> under %5$s in your XML Sitemap settings.', 'xml-sitemap-feed'),
12
+ translate('Date archives','wp-seopress'),
13
+ '<a href="' . admin_url('admin.php') . '?page=seopress-titles#tab=tab_seopress_titles_archives">' . translate('Archives','wp-seopress') . '</a>',
14
+ __( 'Split by', 'xml-sitemap-feed' ),
15
+ translate('None'),
16
+ '<a href="' . admin_url('options-general.php') . '?page=xmlsf">' . __('Included post types','xml-sitemap-feed') . '</a>'
17
+ ); ?>
18
+ </p>
19
  <form action="" method="post">
20
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
21
  <p>
views/admin/notice-seopress-sitemap.php CHANGED
@@ -1,17 +1,20 @@
1
  <div class="notice notice-error fade is-dismissible">
2
  <p>
3
- <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
- </p>
5
- <p>
6
- <?php printf( /* translators: Plugn name, Sitemap page name (linked to SEOPress plugin settings), XML Sitemap Index, Reading Settings admin page (linked to Reading settings) */
7
- __( 'The SEOPress XML Sitemap is not compatible with %1$s. Please either disable the XML Sitemap under %2$s in your SEO settings or disable the option %3$s on %4$s.', 'xml-sitemap-feed'),
8
- __('XML Sitemap & Google News','xml-sitemap-feed'),
9
- '<a href="' . admin_url('admin.php') . '?page=seopress-xml-sitemap">' . translate('XML / HTML Sitemap','wp-seopress') . '</a>',
10
- __('XML Sitemap Index','xml-sitemap-feed'),
11
- '<a href="' . admin_url('options-reading.php') . '#xmlsf_sitemaps">' . translate('Reading Settings') . '</a>'
12
- );
13
- ?>
14
- </p>
 
 
 
15
  <form action="" method="post">
16
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
17
  <p>
1
  <div class="notice notice-error fade is-dismissible">
2
  <p>
3
+ <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
+ </p>
5
+ <p>
6
+ <?php printf( /* translators: Conflicting Plugn name, Plugin name */
7
+ __( 'The %1$s XML Sitemap is not compatible with %2$s.', 'xml-sitemap-feed'),
8
+ translate('SEOPress','wp-seopress'),
9
+ __('XML Sitemap & Google News','xml-sitemap-feed')
10
+ ); ?>
11
+ <?php printf( /* translators: Sitemap page name (linked to SEOPress plugin settings), XML Sitemap Index, Reading Settings admin page (linked to Reading settings) */
12
+ __( 'Please either disable the XML Sitemap under %1$s in your SEO settings or disable the option %2$s on %3$s.', 'xml-sitemap-feed'),
13
+ '<a href="' . admin_url('admin.php') . '?page=seopress-xml-sitemap">' . translate('XML / HTML Sitemap','wp-seopress') . '</a>',
14
+ __('XML Sitemap Index','xml-sitemap-feed'),
15
+ '<a href="' . admin_url('options-reading.php') . '#xmlsf_sitemaps">' . translate('Reading Settings') . '</a>'
16
+ ); ?>
17
+ </p>
18
  <form action="" method="post">
19
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
20
  <p>
views/admin/notice-static-files.php CHANGED
File without changes
views/admin/notice-wpseo-date-redirect.php CHANGED
@@ -3,15 +3,18 @@
3
  <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
  </p>
5
  <p>
 
 
 
 
6
  <?php printf( /* translators: Date archives, Archives (linked to WP SEO plugin settings), Split by, None, Included post types (linked to Sitemap settings) */
7
- __( 'A setting in the WordPress SEO plugin causes all date based sitemaps to redirect to the main page. Please either enable <strong>%1$s</strong> under %2$s in your SEO settings or set all <strong>%3$s</strong> options to <strong>%4$s</strong> under %5$s in your XML Sitemap settings.', 'xml-sitemap-feed'),
8
  translate('Date archives','wordpress-seo'),
9
  '<a href="' . admin_url('admin.php') . '?page=wpseo_titles#top#archives">' . translate('Archives','wordpress-seo') . '</a>',
10
- __('Split by','xml-sitemap-feed'),
11
  translate('None'),
12
  '<a href="' . admin_url('options-general.php') . '?page=xmlsf">' . __('Included post types','xml-sitemap-feed') . '</a>'
13
- );
14
- ?>
15
  </p>
16
  <form action="" method="post">
17
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
3
  <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
  </p>
5
  <p>
6
+ <?php printf( /* translators: conflicting plugin name */
7
+ __( 'A setting in the %s plugin causes all date based sitemaps to redirect to the main page.', 'xml-sitemap-feed'),
8
+ translate('WordPress SEO','wordpress-seo')
9
+ ); ?>
10
  <?php printf( /* translators: Date archives, Archives (linked to WP SEO plugin settings), Split by, None, Included post types (linked to Sitemap settings) */
11
+ __( 'Please either enable <strong>%1$s</strong> under %2$s in your SEO settings or set all <strong>%3$s</strong> options to <strong>%4$s</strong> under %5$s in your XML Sitemap settings.', 'xml-sitemap-feed'),
12
  translate('Date archives','wordpress-seo'),
13
  '<a href="' . admin_url('admin.php') . '?page=wpseo_titles#top#archives">' . translate('Archives','wordpress-seo') . '</a>',
14
+ __( 'Split by', 'xml-sitemap-feed' ),
15
  translate('None'),
16
  '<a href="' . admin_url('options-general.php') . '?page=xmlsf">' . __('Included post types','xml-sitemap-feed') . '</a>'
17
+ ); ?>
 
18
  </p>
19
  <form action="" method="post">
20
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
views/admin/notice-wpseo-sitemap.php CHANGED
@@ -1,17 +1,20 @@
1
  <div class="notice notice-warning fade is-dismissible">
2
  <p>
3
- <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
- </p>
5
- <p>
6
- <?php printf( /* translators: Plugn name, Features (linked to WP SEO plugin settings), XML Sitemap Index, Reading Settings admin page (linked to Reading settings) */
7
- __( 'The WordPress SEO plugin may be used in conjunction with %1$s but it is not advised to have the same feature enabled in both plugins. Please either disable the Yoast sitemap under %2$s in your SEO settings or disable the option %3$s on %4$s.', 'xml-sitemap-feed'),
8
- __('XML Sitemap & Google News','xml-sitemap-feed'),
9
- '<a href="' . admin_url('admin.php') . '?page=wpseo_dashboard#top#features">' . translate('Features','wordpress-seo') . '</a>',
10
- __('XML Sitemap Index','xml-sitemap-feed'),
11
- '<a href="' . admin_url('options-reading.php') . '#xmlsf_sitemaps">' . translate('Reading Settings') . '</a>'
12
- );
13
- ?>
14
- </p>
 
 
 
15
  <form action="" method="post">
16
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
17
  <p>
1
  <div class="notice notice-warning fade is-dismissible">
2
  <p>
3
+ <strong><?php _e('XML Sitemap & Google News','xml-sitemap-feed'); ?></strong>
4
+ </p>
5
+ <p>
6
+ <?php printf( /* translators: Conflicting Plugn name, Plugin name */
7
+ __( 'The %1$s XML Sitemap is not compatible with %2$s.', 'xml-sitemap-feed'),
8
+ translate('WordPress SEO','wordpress-seo'),
9
+ __( 'XML Sitemap & Google News', 'xml-sitemap-feed' )
10
+ ); ?>
11
+ <?php printf( /* translators: Sitemap page name (linked to SEOPress plugin settings), XML Sitemap Index, Reading Settings admin page (linked to Reading settings) */
12
+ __( 'Please either disable the XML Sitemap under %1$s in your SEO settings or disable the option %2$s on %3$s.', 'xml-sitemap-feed'),
13
+ '<a href="' . admin_url('admin.php') . '?page=wpseo_dashboard#top#features">' . translate('Features','wordpress-seo') . '</a>',
14
+ __('XML Sitemap Index','xml-sitemap-feed'),
15
+ '<a href="' . admin_url('options-reading.php') . '#xmlsf_sitemaps">' . translate('Reading Settings') . '</a>'
16
+ ); ?>
17
+ </p>
18
  <form action="" method="post">
19
  <?php wp_nonce_field( XMLSF_BASENAME.'-notice', '_xmlsf_notice_nonce' ); ?>
20
  <p>
views/admin/page-sitemap-news.php CHANGED
File without changes
views/admin/page-sitemap.php CHANGED
File without changes
views/admin/sidebar-contribute.php CHANGED
File without changes
views/admin/sidebar-help.php CHANGED
File without changes
views/feed-sitemap-custom.php CHANGED
File without changes
views/feed-sitemap-home.php CHANGED
File without changes
views/feed-sitemap-news.php CHANGED
File without changes
views/feed-sitemap-post_type.php CHANGED
@@ -32,10 +32,6 @@ echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . '"?>
32
  xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
33
  http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd<?php echo $image_schema; ?>">
34
  <?php
35
-
36
- // set empty sitemap flag
37
- $have_posts = false;
38
-
39
  // loop away!
40
  if ( have_posts() ) :
41
  while ( have_posts() ) :
32
  xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
33
  http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd<?php echo $image_schema; ?>">
34
  <?php
 
 
 
 
35
  // loop away!
36
  if ( have_posts() ) :
37
  while ( have_posts() ) :
views/feed-sitemap-taxonomy.php CHANGED
File without changes
views/feed-sitemap.php CHANGED
File without changes
xml-sitemap.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: XML Sitemap & Google News
4
  Plugin URI: http://status301.net/wordpress-plugins/xml-sitemap-feed/
5
  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 :)
6
- Version: 5.2.3
7
  Text Domain: xml-sitemap-feed
8
  Requires at least: 4.6
9
  Requires PHP: 5.4
@@ -11,7 +11,7 @@ Author: RavanH
11
  Author URI: http://status301.net/
12
  */
13
 
14
- define( 'XMLSF_VERSION', '5.2.3' );
15
 
16
  /* Copyright 2019 RavanH
17
  http://status301.net/
3
  Plugin Name: XML Sitemap & Google News
4
  Plugin URI: http://status301.net/wordpress-plugins/xml-sitemap-feed/
5
  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 :)
6
+ Version: 5.2.4
7
  Text Domain: xml-sitemap-feed
8
  Requires at least: 4.6
9
  Requires PHP: 5.4
11
  Author URI: http://status301.net/
12
  */
13
 
14
+ define( 'XMLSF_VERSION', '5.2.4' );
15
 
16
  /* Copyright 2019 RavanH
17
  http://status301.net/