[PHP-WEBMASTER] [web-wiki] master: Upgrade to 2022-07-31b Igor

[Niklas Keller]

Author: Niklas Keller (kelunik)
Date: 2023-08-05T20:17:26+02:00

Commit: 
https://github.com/php/web-wiki/commit/24a733443840464d87a1a2a787c3d1350c2ea5a1
Raw diff: 
https://github.com/php/web-wiki/commit/24a733443840464d87a1a2a787c3d1350c2ea5a1.diff

Upgrade to 2022-07-31b Igor

Changed paths:
  M  dokuwiki/VERSION
  M  dokuwiki/doku.php
  M  dokuwiki/inc/parser/xhtml.php


Diff:

diff --git a/dokuwiki/VERSION b/dokuwiki/VERSION
index 7658b607..2800ff9b 100644
--- a/dokuwiki/VERSION
+++ b/dokuwiki/VERSION
@@ -1 +1 @@
-2022-07-31a "Igor"
+2022-07-31b "Igor"
diff --git a/dokuwiki/doku.php b/dokuwiki/doku.php
index 50e37263..f5117ee5 100644
--- a/dokuwiki/doku.php
+++ b/dokuwiki/doku.php
@@ -11,7 +11,7 @@
 // update message version - always use a string to avoid localized floats!
 use dokuwiki\Extension\Event;
 
-$updateVersion = "53";
+$updateVersion = "53.1";
 
 //  xdebug_start_profiling();
 
diff --git a/dokuwiki/inc/parser/xhtml.php b/dokuwiki/inc/parser/xhtml.php
index 4c2cb78b..2c7ff54a 100644
--- a/dokuwiki/inc/parser/xhtml.php
+++ b/dokuwiki/inc/parser/xhtml.php
@@ -1345,17 +1345,15 @@ public function rss($url, $params) {
             for($x = $start; $x != $end; $x += $mod) {
                 $item = $feed->get_item($x);
                 $this->doc .= '<li><div class="li">';
-                // support feeds without links
+
                 $lnkurl = $item->get_permalink();
+                $title = html_entity_decode($item->get_title(), ENT_QUOTES, 
'UTF-8');
+
+                // support feeds without links
                 if($lnkurl) {
-                    // title is escaped by SimplePie, we unescape here because 
it
-                    // is escaped again in externallink() FS#1705
-                    $this->externallink(
-                        $item->get_permalink(),
-                        html_entity_decode($item->get_title(), ENT_QUOTES, 
'UTF-8')
-                    );
+                    $this->externallink($item->get_permalink(), $title);
                 } else {
-                    $this->doc .= ' '.$item->get_title();
+                    $this->doc .= ' '.hsc($item->get_title());
                 }
                 if($params['author']) {
                     $author = $item->get_author(0);
@@ -1369,11 +1367,14 @@ public function rss($url, $params) {
                     $this->doc .= ' 
('.$item->get_local_date($conf['dformat']).')';
                 }
                 if($params['details']) {
+                    $desc = $item->get_description();
+                    $desc = strip_tags($desc);
+                    $desc = html_entity_decode($desc, ENT_QUOTES, 'UTF-8');
                     $this->doc .= '<div class="detail">';
                     if($conf['htmlok']) {
-                        $this->doc .= $item->get_description();
+                        $this->doc .= hsc($item->get_description());
                     } else {
-                        $this->doc .= strip_tags($item->get_description());
+                        $this->doc .= hsc($desc);
                     }
                     $this->doc .= '</div>';
                 }

-- 
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php