[php-blog-cvs] serendipity/include functions_entries.inc.php,1.1.2.1,1.1.2.2 plugin_internal.inc.php,1.1.2.1,1.1.2.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17878/include

Modified Files:
      Tag: branch-smarty
	functions_entries.inc.php plugin_internal.inc.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: plugin_internal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/plugin_internal.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- plugin_internal.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ plugin_internal.inc.php	8 Nov 2004 09:25:31 -0000	1.1.2.2
@@ -441,8 +441,6 @@
                                         'show_atom0.3',
                                         'show_opml1.0',
                                         'seperator',
-                                        'prevent_cache',
-                                        'seperator',
                                         'field_managingEditor',
                                         'field_webMaster',
                                         'field_ttl',
@@ -511,13 +509,6 @@
                 $propbag->add('type',        'seperator');
                 break;
 
-            case 'prevent_cache':
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        SYNDICATION_PLUGIN_PREVENT_CACHE);
-                $propbag->add('description', SYNDICATION_PLUGIN_PREVENT_CACHE_DESC);
-                $propbag->add('default',     'false');
-                break;
-
             case 'field_managingEditor':
                 $propbag->add('type',        'string');
                 $propbag->add('name',        SYNDICATION_PLUGIN_MANAGINGEDITOR);
@@ -579,12 +570,6 @@
 
         $title = SYNDICATE_THIS_BLOG;
 
-        if ($this->get_config('prevent_cache') == 'true') {
-            $cache = '&nocache=true';
-        } else {
-            $cache = '';
-        }
-
         if (serendipity_db_bool($this->get_config('show_0.91', true))) {
 ?>
         <div style="padding-bottom: 2px;">

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/Attic/functions_entries.inc.php,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- functions_entries.inc.php	6 Nov 2004 11:22:49 -0000	1.1.2.1
+++ functions_entries.inc.php	8 Nov 2004 09:25:31 -0000	1.1.2.2
@@ -73,7 +73,7 @@
 * (For february 2002 you would pass 200202 for all entries withing
 * two timestamps you would pass array(timestamp1,timestamp2)
 **/
-function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false) {
+function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '', $noCache = false, $noSticky = false) {
     global $serendipity;
 
     $cond = array();
@@ -191,7 +191,7 @@
         }
     }
 
-    serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => $noCache));
+    serendipity_plugin_api::hook_event('frontend_fetchentries', $cond, array('noCache' => $noCache, 'noSticky' => $noSticky));
 
     if (strtolower($serendipity['dbType']) == 'postgres') {
         $group    = '';