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 08:29:43
Branch: HEAD Handle: 2008052907294200
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
modifying package: drupal-6.2 20080528 -> 20080529
Summary:
Revision Changes Path
1.17 +23 -14 openpkg-src/drupal/drupal.patch
1.260 +2 -2 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.16 -r1.17 drupal.patch
--- openpkg-src/drupal/drupal.patch 28 May 2008 18:59:11 -0000 1.16
+++ openpkg-src/drupal/drupal.patch 29 May 2008 06:29:42 -0000 1.17
@@ -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.16 2008/05/28 18:59:11 rse Exp $ */
++/* $Id: drupal.patch,v 1.17 2008/05/29 06:29:42 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -578,23 +578,23 @@
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.
-4. Additionally, support an optional XML content prolog (mainly
+4. Additionally, support an optional XML content template (mainly
for loading ENTITY definitions which cannot be done via XSD and XSLT)
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-28 20:55:11
+0200
++++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-29 08:27:28
+0200
@@ -39,7 +39,16 @@
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", '');
-+ $prolog_path = variable_get("xmlcontent_prolog_path_$format", '');
-+ if ($prolog_path != "") {
-+ if (substr($prolog_path, 0, 1) != "/")
-+ $prolog_path = drupal_get_path('module', 'xmlcontent') . '/'
. $prolog_path;
-+ $prolog = file_get_contents($prolog_path);
-+ $text = $prolog . $text;
++ $tpl_path = variable_get("xmlcontent_tpl_path_$format", '');
++ if ($tpl_path != "") {
++ if (substr($tpl_path, 0, 1) != "/")
++ $tpl_path = drupal_get_path('module', 'xmlcontent') . '/' .
$tpl_path;
++ $tpl = file_get_contents($tpl_path);
++ $text = preg_replace(/&template_body;/, $text, $tpl);
+ }
+ $xslt_path = variable_get("xmlcontent_xslt_path_$format", '');
+ if (substr($xslt_path, 0, 1) != "/")
@@ -627,17 +627,26 @@
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
-+ $form['xmlcontent']["xmlcontent_prolog_path_$format"] = array(
++ $form['xmlcontent']["xmlcontent_tpl_path_$format"] = array(
+ '#type' => 'textfield',
-+ '#title' => t('Optional XML Prolog File Path'),
-+ '#default_value' => variable_get("xmlcontent_prolog_path_$format", ''),
++ '#title' => t('Optional XML Template File Path'),
++ '#default_value' => variable_get("xmlcontent_tpl_path_$format", ''),
+ '#field_prefix' => drupal_get_path('module', 'xmlcontent'). '/',
-+ '#description' => t('The file path to the optional XML prolog,
prepended to the XML content before processing.'),
++ '#description' => t('The file path to the optional XML template,
wrapper around the XML content before processing.'),
+ );
$form['xmlcontent']["xmlcontent_xslt_path_$format"] = array(
'#type' => 'textfield',
'#title' => t('XSLT Script File Path'),
-@@ -242,10 +261,8 @@
+@@ -218,6 +237,8 @@
+
+ // Load the XML document
+ $dom = new DomDocument('1.0', 'UTF-8');
++ $dom->resolveExternals = true;
++ $dom->substituteEntities = true;
+ $valid = $dom->loadXML($xml);
+ if (!$valid) {
+ watchdog('xmlcontent', "Invalid XML Content", WATCHDOG_WARNING);
+@@ -242,10 +263,8 @@
}
// Transform
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.259 -r1.260 drupal.spec
--- openpkg-src/drupal/drupal.spec 28 May 2008 18:59:11 -0000 1.259
+++ openpkg-src/drupal/drupal.spec 29 May 2008 06:29:42 -0000 1.260
@@ -27,7 +27,7 @@
# package versions (extension modules)
%define V_module_acl 6.x-1.x-dev
%define V_module_activemenu 6.x-1.x-dev
-%define V_module_akismet 6.x-1.x-dev
+%define V_module_akismet 6.x-1.0-beta1
%define V_module_alt_login 6.x-1.0
%define V_module_archive 6.x-1.2
%define V_module_atom 6.x-1.0
@@ -213,7 +213,7 @@
Group: CMS
License: GPL
Version: %{V_drupal}
-Release: 20080528
+Release: 20080529
# package options
%option with_mysql yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
