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:28:33
Branch: HEAD Handle: 2008052317283300
Modified files:
openpkg-src/drupal drupal.patch
Log:
Arglll... is it me, is it really me? Every piece of code I want to
_USE_ I first have to _FIX_. This time the developer of the
'xmlcontent' module has never tested its module in case one has
multiple filters enabled for a particular input type
Summary:
Revision Changes Path
1.13 +20 -1 openpkg-src/drupal/drupal.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 drupal.patch
--- openpkg-src/drupal/drupal.patch 23 May 2008 15:11:55 -0000 1.12
+++ openpkg-src/drupal/drupal.patch 23 May 2008 16:28:33 -0000 1.13
@@ -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.12 2008/05/23 15:11:55 rse Exp $ */
++/* $Id: drupal.patch,v 1.13 2008/05/23 16:28:33 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -569,3 +569,22 @@
drupal_set_message(t('The access rule has been deleted.'));
$form_state['redirect'] = 'admin/user/rules';
return;
+
+-----------------------------------------------------------------------------
+
+Fix content validation in "xmlcontent" module in case
+one has enabled multiple filters on a particular input format.
+
+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 @@
+ }
+ // Does the input format of this node use XML Content filter?
+ $format = filter_resolve_format($node->format);
+- $module = db_result(db_query('SELECT module FROM {filters} WHERE
format = %d', $format));
++ $module = db_result(db_query("SELECT module FROM {filters} WHERE
format = %d AND module = 'xmlcontent'", $format));
+ if ($module != 'xmlcontent') {
+ return;
+ }
+
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
