From e764de48e89e2460789eac153080129a66e2ee05 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Sun, 23 Apr 2006 20:00:40 +0000 Subject: [PATCH] Fix bug #1474290 --- docs/NEWS | 4 ++++ include/functions_entries.inc.php | 6 ++++-- templates/carl_contest/entries.tpl | 2 +- templates/competition/entries.tpl | 2 +- templates/contest/entries.tpl | 2 +- templates/default/entries.tpl | 2 +- templates/kubrick/entries.tpl | 2 +- templates/wp/entries.tpl | 6 +++--- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 55a5f5c..4ac252b 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,10 @@ Version 1.1-alpha4() ------------------------------------------------------------------------ + * Fix multiple occurences of the string "--" in the entry title to + not mess up HTML display because of weird Firefox interpretation + (Bug #1474290) (garvinhicking) + * Made "fullfeed" syndication option also support "let the client decide", via $_GET['fullFeed'] = true/false. (garvinhicking) diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php index 95433e8..cc0ec53 100644 --- a/include/functions_entries.inc.php +++ b/include/functions_entries.inc.php @@ -923,9 +923,12 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm $entry['link'] = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath', true, array('timestamp' => $entry['timestamp'])); $entry['commURL'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false, array('timestamp' => $entry['timestamp'])); - $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', true, array('timestamp' => $entry['timestamp'])); $entry['title'] = htmlspecialchars($entry['title']); + $entry['title_rdf'] = preg_replace('@-{2,}@', '-', $entry['title']); + $entry['rdf_ident'] = serendipity_archiveURL($entry['id'], $entry['title_rdf'], 'baseURL', true, array('timestamp' => $entry['timestamp'])); + $entry['link_rdf'] = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf'); + $entry['link_allow_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=enable&serendipity[entry]=' . $entry['id']; $entry['link_deny_comments'] = $serendipity['baseURL'] . 'comment.php?serendipity[switch]=disable&serendipity[entry]=' . $entry['id']; $entry['allow_comments'] = serendipity_db_bool($entry['allow_comments']); @@ -935,7 +938,6 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm $entry['link_popup_trackbacks'] = $serendipity['serendipityHTTPPath'] .'comment.php?serendipity[entry_id]='. $entry['id'] .'&serendipity[type]=trackbacks'; $entry['link_edit'] = $serendipity['baseURL'] .'serendipity_admin.php?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]='. $entry['id']; $entry['link_trackback'] = $serendipity['baseURL'] .'comment.php?type=trackback&entry_id='. $entry['id']; - $entry['link_rdf'] = serendipity_rewriteURL(PATH_FEEDS . '/ei_'. $entry['id'] .'.rdf'); $entry['link_viewmode_threaded'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_THREADED; $entry['link_viewmode_linear'] = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] .'?url='. $entry['commURL'] .'&serendipity[cview]='. VIEWMODE_LINEAR; $entry['link_author'] = serendipity_authorURL($authorData); diff --git a/templates/carl_contest/entries.tpl b/templates/carl_contest/entries.tpl index 072157c..3f4d3b2 100644 --- a/templates/carl_contest/entries.tpl +++ b/templates/carl_contest/entries.tpl @@ -78,7 +78,7 @@ --> diff --git a/templates/competition/entries.tpl b/templates/competition/entries.tpl index 8e6df90..7373361 100644 --- a/templates/competition/entries.tpl +++ b/templates/competition/entries.tpl @@ -80,7 +80,7 @@ --> diff --git a/templates/contest/entries.tpl b/templates/contest/entries.tpl index 53d5d1c..3d3a9df 100644 --- a/templates/contest/entries.tpl +++ b/templates/contest/entries.tpl @@ -87,7 +87,7 @@ --> diff --git a/templates/default/entries.tpl b/templates/default/entries.tpl index 86f421f..be0a0f2 100644 --- a/templates/default/entries.tpl +++ b/templates/default/entries.tpl @@ -77,7 +77,7 @@ --> diff --git a/templates/kubrick/entries.tpl b/templates/kubrick/entries.tpl index 88f23bd..ffcd8e2 100644 --- a/templates/kubrick/entries.tpl +++ b/templates/kubrick/entries.tpl @@ -88,7 +88,7 @@ --> diff --git a/templates/wp/entries.tpl b/templates/wp/entries.tpl index 6e1525f..7a6d6b7 100644 --- a/templates/wp/entries.tpl +++ b/templates/wp/entries.tpl @@ -17,7 +17,7 @@ {/foreach} — {$entry.author} @ {$entry.timestamp|@formatTime:'%I:%M %p'} - +

{$entry.body} @@ -30,7 +30,7 @@ {/if}

-