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: 15-Oct-2008 20:04:41
Branch: HEAD Handle: 2008101519044000
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
modifying package: drupal-6.5 20081015 again
Summary:
Revision Changes Path
1.33 +1 -18 openpkg-src/drupal/drupal.patch
1.365 +1 -1 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.32 -r1.33 drupal.patch
--- openpkg-src/drupal/drupal.patch 11 Oct 2008 07:18:03 -0000 1.32
+++ openpkg-src/drupal/drupal.patch 15 Oct 2008 18:04:40 -0000 1.33
@@ -267,23 +267,6 @@
return $plugins;
}
------------------------------------------------------------------------------
-
-Fix SQL in "remove" functionality of "img_assist" module.
-http://drupal.org/node/250128
-
-Index: sites/all/modules/img_assist/img_assist.module
---- sites/all/modules/img_assist/img_assist.module.orig 2008-04-06
19:32:33 +0200
-+++ sites/all/modules/img_assist/img_assist.module 2008-05-02 21:00:24
+0200
-@@ -1239,7 +1239,7 @@
- }
-
- function _img_assist_remove($node, $size) {
-- $result = db_query("SELECT * FROM {files} f INNER JOIN {image} i WHERE
f.fid = i.fid AND i.nid = %d AND f.filename = '%s'", $node->nid, $size['key']);
-+ $result = db_query("SELECT * FROM {files} f INNER JOIN {image} ON f.fid =
i.fid WHERE i.nid = %d AND f.filename = '%s'", $node->nid, $size['key']);
- while ($file = db_fetch_object($result)) {
- // Never delete original image.
- if ($file->filepath != $node->images[IMAGE_ORIGINAL]) {
-----------------------------------------------------------------------------
@@ -344,7 +327,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.32 2008/10/11 07:18:03 rse Exp $ */
++/* $Id: drupal.patch,v 1.33 2008/10/15 18:04:40 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.364 -r1.365 drupal.spec
--- openpkg-src/drupal/drupal.spec 15 Oct 2008 06:27:00 -0000 1.364
+++ openpkg-src/drupal/drupal.spec 15 Oct 2008 18:04:40 -0000 1.365
@@ -103,7 +103,7 @@
%define V_module_image_caption 6.x-2.2
%define V_module_imce 6.x-1.1
%define V_module_imceimage 6.x-1.x-dev
-%define V_module_img_assist 6.x-1.0-beta1
+%define V_module_img_assist 6.x-1.0
%define V_module_img_filter 6.x-2.2
%define V_module_int_meta 6.x-1.0-beta
%define V_module_jquery_plugin 6.x-1.5
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
