Only show local public notices in sitemap

Only show local public notices in sitemap. Only do counts for them
in the sitemap index, and only show them in the notice sitemap.

diff --git a/plugins/Sitemap/Sitemap_notice_count.php b/plugins/Sitemap/Sitemap_notice_count.php
index 673417b788471ea816baf24b1451b086552fe67a..2a375b3e48a35ecd821691116251b31a88b526bf 100644 (file)
--- a/plugins/Sitemap/Sitemap_notice_count.php
+++ b/plugins/Sitemap/Sitemap_notice_count.php
@@ -208,6 +208,7 @@ class Sitemap_notice_count extends Memcached_DataObject
     {
         $notice = new Notice();
         $notice->whereAdd('created BETWEEN "'.$d.' 00:00:00" AND "'.self::incrementDay($d).' 00:00:00"');
+        $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
         $n = $notice->count();
 
         return $n;

diff --git a/plugins/Sitemap/noticesitemap.php b/plugins/Sitemap/noticesitemap.php
index 9f323f72aaa79ea766e5c60bdb19dbe0314d6616..7d9d2e5d68848867a75db2f65bb2eb28ccac467b 100644 (file)
--- a/plugins/Sitemap/noticesitemap.php
+++ b/plugins/Sitemap/noticesitemap.php
@@ -105,7 +105,7 @@ class NoticesitemapAction extends SitemapAction
             $notice->whereAdd("created >= '$begindt'");
             $notice->whereAdd("created <  '$enddt'");
 
-            $notice->whereAdd('is_local != 0');
+            $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
 
             $notice->orderBy('created');