Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878
Modified Files:
Tag: branch-smarty
rss.php
Log Message:
* RSS feed should not display sticky posts as sticky
* RSS Export uses reverse chronological order for easier import
* Fixed PostgreSQL concatenation issue
* Fixed entry visibility (private/hidden/member) attribute to work as
intended
* Remove obsolete "force nocache" directive for RSS feed.
Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.28.2.5
retrieving revision 1.28.2.6
diff -u -d -r1.28.2.5 -r1.28.2.6
--- rss.php 6 Nov 2004 11:22:45 -0000 1.28.2.5
+++ rss.php 8 Nov 2004 09:25:18 -0000 1.28.2.6
@@ -26,7 +26,7 @@
break;
case 'content':
default:
- $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC');
+ $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC', '', false, true);
break;
}
@@ -70,9 +70,10 @@
case 'content':
default:
if (isset($_GET['all']) && $_GET['all']) {
- $entries = serendipity_fetchEntries(null, true);
+ // Fetch all entries in reverse order for later importing. Fetch sticky entries as normal entries.
+ $entries = serendipity_fetchEntries(null, true, '', false, false, 'id ASC', '', false, true);
} else {
- $entries = serendipity_fetchEntries(null, true, 15, false, (isset($modified_since) ? $modified_since : false));
+ $entries = serendipity_fetchEntries(null, true, 15, false, (isset($modified_since) ? $modified_since : false), 'timestamp DESC', '', false, true);
}
break;
}
|
