Pārlūkot izejas kodu

substitute XML entities also in the XML stylesheet

Ralf S. Engelschall 17 gadi atpakaļ
vecāks
revīzija
0f2ce276f3
1 mainītis faili ar 12 papildinājumiem un 3 dzēšanām
  1. 12 3
      drupal/drupal.patch

+ 12 - 3
drupal/drupal.patch

@@ -330,7 +330,7 @@ Index: sites/all/modules/img_assist/img_assist_popup.js
 --- /dev/null	2008-05-02 21:08:21 +0200
 +++ sites/all/modules/img_assist/img_assist_popup.js	2008-05-02 21:05:56 +0200
 @@ -0,0 +1,20 @@
-+/* $Id: drupal.patch,v 1.18 2008/05/29 10:12:36 rse Exp $ */
++/* $Id: drupal.patch,v 1.19 2008/05/29 11:13:43 rse Exp $ */
 +
 +function launch_popup(nid, mw, mh) {
 +	var ox = mw;
@@ -583,7 +583,7 @@ Index: modules/user/user.admin.inc
 
 Index: sites/all/modules/xmlcontent/xmlcontent.module
 --- sites/all/modules/xmlcontent/xmlcontent.module.orig	2007-03-14 22:59:59 +0100
-+++ sites/all/modules/xmlcontent/xmlcontent.module	2008-05-29 12:10:00 +0200
++++ sites/all/modules/xmlcontent/xmlcontent.module	2008-05-29 13:11:51 +0200
 @@ -39,7 +39,16 @@
        return t('Allows users to post XML node content and get it transformed through a configured XSLT script');
  
@@ -664,7 +664,16 @@ Index: sites/all/modules/xmlcontent/xmlcontent.module
    $valid = $dom->loadXML($xml);
    if (!$valid) {
      watchdog('xmlcontent', "Invalid XML Content", WATCHDOG_WARNING);
-@@ -242,10 +272,8 @@
+@@ -227,6 +257,8 @@
+   // Load the XSLT script
+   // TODO: is there a way to cache it, or not necessary
+   $xsl = new DomDocument('1.0', 'UTF-8');
++  $xsl->resolveExternals = true;
++  $xsl->substituteEntities = true;
+   $xsl->load($path_to_xslt);   
+ 
+   // Create the XSLT processor
+@@ -242,10 +274,8 @@
    }
  
    // Transform