Changeset 3424:7b8434cae028 for inc

Timestamp:

11/26/16 12:27:37 (9 years ago)

Author:

Jean-Christian Denis

Branch:

default

Message:

Fix HTML validation on RDF EntryPingData?, closes #2073

Location:

inc

Files:

• core/class.dc.rs.extensions.php (modified) (2 diffs)
• public/class.dc.template.php (modified) (1 diff)

inc/core/class.dc.rs.extensions.php

@@ -379 +379 @@
      @return   <b>string</b>
      */
-     public static function getTrackbackData($rs)
+     public static function getTrackbackData($rs,$format='html')
      {
           return
-          "<![CDATA[>\n".
-          "<!--[\n".
+          ($format == 'xml' ? "<![CDATA[>\n" : '').
+          "<!--\n".
           '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"'."\n".
           '  xmlns:dc="http://purl.org/dc/elements/1.1/"'."\n".
@@ -393 +393 @@
           '  trackback:ping="'.$rs->getTrackbackLink().'" />'."\n".
           "</rdf:RDF>\n".
-          "<!]]><!---->\n";
+          ($format == 'xml' ? "<!]]><!--" : '').
+          "-->\n";
      }
 

inc/public/class.dc.template.php

@@ -1921 +1921 @@
      public function EntryPingData($attr)
      {
-          return "<?php if (\$_ctx->posts->trackbacksActive()) { echo \$_ctx->posts->getTrackbackData(); } ?>\n";
+          $format = !empty($attr['format']) && $attr['format'] == 'xml' ? 'xml' : 'html';
+          return "<?php if (\$_ctx->posts->trackbacksActive()) { echo \$_ctx->posts->getTrackbackData('".$format."'); } ?>\n";
      }