OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-May-2008 13:13:43
Branch: HEAD Handle: 2008052912134300
Modified files:
openpkg-src/drupal drupal.patch
Log:
substitute XML entities also in the XML stylesheet
Summary:
Revision Changes Path
1.19 +12 -3 openpkg-src/drupal/drupal.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.18 -r1.19 drupal.patch
--- openpkg-src/drupal/drupal.patch 29 May 2008 10:12:36 -0000 1.18
+++ openpkg-src/drupal/drupal.patch 29 May 2008 11:13:43 -0000 1.19
@@ -330,7 +330,7 @@
--- /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: 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 @@
$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
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
