Fix bug #1474290

diff --git a/docs/NEWS b/docs/NEWS
index 55a5f5c796df10fb33a5d8f7523871479c12fc2a..4ac252bea60900c60f944efb45c3643c70356d70 100644 (file)
--- 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 95433e8ed58073ef118621290f7efff463312012..cc0ec53daa6d61aa177ecd761b5ff09eb03a05fe 100644 (file)
--- 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 072157c60d1bc6faa51594e2bb4de1f2a7162f1d..3f4d3b2b4bc191724469b345ba1fe2583ee7cb7b 100644 (file)
--- a/templates/carl_contest/entries.tpl
+++ b/templates/carl_contest/entries.tpl
@@ -78,7 +78,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->

diff --git a/templates/competition/entries.tpl b/templates/competition/entries.tpl
index 8e6df9003c1a3465fb49c8e68a84132583fbec33..737336151fdc1fe5031404ff6b4ea6ac885243dc 100644 (file)
--- a/templates/competition/entries.tpl
+++ b/templates/competition/entries.tpl
@@ -80,7 +80,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->

diff --git a/templates/contest/entries.tpl b/templates/contest/entries.tpl
index 53d5d1cbe2c8d8be1998030b2eb7615d4037edd0..3d3a9df5e347527c31ce6d552c748315aa3b65b4 100644 (file)
--- a/templates/contest/entries.tpl
+++ b/templates/contest/entries.tpl
@@ -87,7 +87,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->

diff --git a/templates/default/entries.tpl b/templates/default/entries.tpl
index 86f421f6611ccdc58bd25047f551bce36f82a5e7..be0a0f2b75cb3ec57450c0892d7d7e726e529462 100644 (file)
--- a/templates/default/entries.tpl
+++ b/templates/default/entries.tpl
@@ -77,7 +77,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->

diff --git a/templates/kubrick/entries.tpl b/templates/kubrick/entries.tpl
index 88f23bd909e78519e98c727c566eb3daa78e83b4..ffcd8e2760b173c73e9c68ba260a920b141c0e80 100644 (file)
--- a/templates/kubrick/entries.tpl
+++ b/templates/kubrick/entries.tpl
@@ -88,7 +88,7 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->

diff --git a/templates/wp/entries.tpl b/templates/wp/entries.tpl
index 6e1525f15319ddb8b102d2c512f3079dbfd06251..7a6d6b78a9b86225553890e851ca5f219b702379 100644 (file)
--- a/templates/wp/entries.tpl
+++ b/templates/wp/entries.tpl
@@ -17,7 +17,7 @@
           {/foreach}</ul>
           &#8212; {$entry.author} @ {$entry.timestamp|@formatTime:'%I:%M %p'}
         </div>
-       
+
        <div class="storycontent">
           <p>
             {$entry.body}
@@ -30,7 +30,7 @@
           {/if}
        </div>
 
-       <div class="feedback"> 
+       <div class="feedback">
           <a href="{$entry.link}#comments">Comments ({$entry.comments+$entry.trackbacks})</a>
           {$entry.add_footer}
        </div>
@@ -42,7 +42,7 @@
         <rdf:Description
                  rdf:about="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/ei_{$entry.id}.rdf"
                  trackback:ping="{$serendipityBaseURL}comment.php?type=trackback&amp;entry_id={$entry.id}"
-                 dc:title="{$entry.title}"
+                 dc:title="{$entry.title_rdf|@default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->