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 18:58:42
Branch: HEAD Handle: 2008052317584100
Modified files:
openpkg-src/drupal drupal.patch
Log:
allow .xsd/.xsl files under arbitrary paths
Summary:
Revision Changes Path
1.14 +29 -4 openpkg-src/drupal/drupal.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 drupal.patch
--- openpkg-src/drupal/drupal.patch 23 May 2008 16:28:33 -0000 1.13
+++ openpkg-src/drupal/drupal.patch 23 May 2008 16:58:41 -0000 1.14
@@ -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.13 2008/05/23 16:28:33 rse Exp $ */
++/* $Id: drupal.patch,v 1.14 2008/05/23 16:58:41 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -574,11 +574,25 @@
Fix content validation in "xmlcontent" module in case
one has enabled multiple filters on a particular input format.
+
+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:22:29
+0200
-@@ -72,7 +72,7 @@
++++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 18:56:10
+0200
+@@ -39,7 +39,9 @@
+ return t('Allows users to post XML node content and get it
transformed through a configured XSLT script');
+
+ case 'process':
+- $xslt_path = drupal_get_path('module', 'xmlcontent'). '/' .
variable_get("xmlcontent_xslt_path_$format", '');
++ $xslt_path = variable_get("xmlcontent_xslt_path_$format", '');
++ if (substr($xslt_path, 0, 1) != "/")
++ $xslt_path = drupal_get_path('module', 'xmlcontent') . '/' .
$xslt_path;
+ return _xmlcontent_transform($text, $xslt_path);
+
+ case 'settings':
+@@ -72,7 +74,7 @@
}
// Does the input format of this node use XML Content filter?
$format = filter_resolve_format($node->format);
@@ -587,4 +601,15 @@
if ($module != 'xmlcontent') {
return;
}
-
+@@ -83,7 +85,10 @@
+ return;
+ }
+
+- $schema_path = drupal_get_path('module', 'xmlcontent'). '/' .
variable_get("xmlcontent_schema_path_$format",'');
++ $schema_path = variable_get("xmlcontent_schema_path_$format", '');
++ if (substr($schema_path, 0, 1) != "/")
++ $schema_path = drupal_get_path('module', 'xmlcontent') . '/' .
$schema_path;
++
+ if (!is_file($schema_path) && ($validation == 'xsd' or $validation ==
'rng')) {
+ $schema_path = null;
+ watchdog( 'xmlcontent', t('Validation required but no schema
file'), WATCHDOG_WARNING );
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
