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: 23-May-2008 20:26:23
Branch: HEAD Handle: 2008052319262300
Modified files:
openpkg-src/drupal drupal.patch
Log:
get rid of the <?xml...?> declaration in the snippet output
Summary:
Revision Changes Path
1.15 +21 -7 openpkg-src/drupal/drupal.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 drupal.patch
--- openpkg-src/drupal/drupal.patch 23 May 2008 16:58:41 -0000 1.14
+++ openpkg-src/drupal/drupal.patch 23 May 2008 18:26:23 -0000 1.15
@@ -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.14 2008/05/23 16:58:41 rse Exp $ */
++/* $Id: drupal.patch,v 1.15 2008/05/23 18:26:23 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -572,15 +572,16 @@
-----------------------------------------------------------------------------
-Fix content validation in "xmlcontent" module in case
-one has enabled multiple filters on a particular input format.
+1. Fix content validation in "xmlcontent" module in case
+ one has enabled multiple filters on a particular input format.
+2. Additionally, allow absolute paths to support .xsd/.xsl files
+ in arbitrary directories.
+3. Finally, do not create a new DOM and output it as XML. Instead directly
+ output the transformed XML in order to get rid of the <?xml...?>
declaration.
-Additionally, allow absolute paths to support .xsd/.xsl files
-in arbitrary directories.
-
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-23 18:56:10
+0200
++++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 20:23:31
+0200
@@ -39,7 +39,9 @@
return t('Allows users to post XML node content and get it
transformed through a configured XSLT script');
@@ -613,3 +614,16 @@
if (!is_file($schema_path) && ($validation == 'xsd' or $validation ==
'rng')) {
$schema_path = null;
watchdog( 'xmlcontent', t('Validation required but no schema
file'), WATCHDOG_WARNING );
+@@ -242,10 +247,8 @@
+ }
+
+ // Transform
+- $newdom = $proc->transformToDoc($dom);
+-
+- // Return the output as XML text (in fact subset of XHTML, depending on
the XSLT script)
+- return $newdom->saveXML();
++ $xml = $proc->transformToXML($dom);
++ return $xml;
+ }
+
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
