php-blog-cvs

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
Fix the -guid trackbacking stuff with a different approach.

We now use <guid isPermaLink="false">. This tells bloglines, RSS Bandit
and others to never ever use <guid> as a link, but always our <link> element
instead. The guid however is still used as a guid, so an entry can change
the title without being marked as "new entry" in the RSS feed, which was
the initial intention of introduciing the -guid.html link.

So we can remove the hackish ;) implementation of allowing trackbacks to 
the -guid.html link, Tom. :-)



Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- functions_entries.inc.php	3 Jan 2005 12:14:25 -0000	1.36
+++ functions_entries.inc.php	3 Jan 2005 21:13:41 -0000	1.37
@@ -556,16 +556,10 @@
             $entry = &$properties['entries'][$x]; // PHP4 Compat
             serendipity_plugin_api::hook_event('frontend_display', $entry);
 
-            if (preg_match(PAT_COMMENTSUB, $_SERVER['REQUEST_URI'], $matches) && $matches[2] == 'guid') {
-                // preg_match detection from index.php - check again if we were called with RSS feed 'guid' permalink. Allow trackbacking to those links as well.
-                $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], 'guid', 'baseURL');
-            } else {
-                $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL');
-            }
-
             $entry['link']      = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
             $entry['title']     = htmlspecialchars($entry['title']);
             $entry['commURL']   = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
+            $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL');
 
             $entry['link_allow_comments']    = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&amp;serendipity[entry]=' . $entry['id'];
             $entry['link_deny_comments']     = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&amp;serendipity[entry]=' . $entry['id'];
@@ -766,7 +760,7 @@
 ?>
     </content:encoded>
     <pubDate><?php echo date('r', serendipity_serverOffsetHour($entry['timestamp'])); ?></pubDate>
-    <guid><?php echo $guid; ?></guid>
+    <guid isPermaLink="false"><?php echo $guid; ?></guid>
     <?php
       $eventData = array_merge(array('display_dat' => ''), $entry);
       serendipity_plugin_api::hook_event('frontend_display:rss-2.0:per_entry', $eventData);