update to 1.7

This commit is contained in:
espie 2008-02-18 12:19:11 +00:00
parent 51eaa32638
commit c91759f179
4 changed files with 33 additions and 23 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $
# $OpenBSD: Makefile,v 1.2 2008/02/18 12:19:11 espie Exp $
COMMENT = image upload for drupal
DISTNAME = image-5.x-1.6
PKGNAME = drupal5-image-1.6
DISTNAME = image-5.x-1.7
PKGNAME = drupal5-image-1.7
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (drupal5/image-5.x-1.6.tar.gz) = WxpvAB6OpqxHtlmd9kXQdA==
RMD160 (drupal5/image-5.x-1.6.tar.gz) = aq1b+zPw2BmHWCmqFUkIWK2Cbpk=
SHA1 (drupal5/image-5.x-1.6.tar.gz) = fuMjKTCr3wfhMO4KTrZruPsCXcE=
SHA256 (drupal5/image-5.x-1.6.tar.gz) = ogcWRhcFPdfGFK3rV2cp1XlFeE1XkCK9v3OVrBs+e6Y=
SIZE (drupal5/image-5.x-1.6.tar.gz) = 124645
MD5 (drupal5/image-5.x-1.7.tar.gz) = fy7+/5F5fkwHItaxjnWHLw==
RMD160 (drupal5/image-5.x-1.7.tar.gz) = 9WzYuI9UKDctxCY7umluL1R8848=
SHA1 (drupal5/image-5.x-1.7.tar.gz) = 5xRdver04sgZcAorFzmJB5S3Dd8=
SHA256 (drupal5/image-5.x-1.7.tar.gz) = u3W/ca03pLyO5unvIFjCenBrBXh8l9ANETDVjjw+x0A=
SIZE (drupal5/image-5.x-1.7.tar.gz) = 136995

View File

@ -1,13 +1,15 @@
$OpenBSD: patch-image_module,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $
--- image.module.orig Fri Feb 15 20:45:40 2008
+++ image.module Fri Feb 15 21:32:02 2008
@@ -391,6 +391,9 @@ function image_file_download($filename) {
// size. This will be the case when the orignal is smaller than a
// derivative size.
$images = $node->images;
+ if (!defined($images)) {
+ return;
+ }
unset($images[IMAGE_ORIGINAL]);
if (user_access('view original images') || in_array($filepath, $images)) {
return array(
$OpenBSD: patch-image_module,v 1.2 2008/02/18 12:19:11 espie Exp $
--- image.module.orig Sun Jan 6 23:03:38 2008
+++ image.module Sun Feb 17 11:53:23 2008
@@ -391,7 +391,10 @@ function image_file_download($filename) {
// the path must be listed for something other than the node's original
// size. This will be the case when the orignal is smaller than a
// derivative size.
- $images = (array) $node->images;
+ $images = $node->images;
+ if (!defined($images)) {
+ return;
+ }
unset($images[IMAGE_ORIGINAL]);
if (user_access('view original images') || in_array($filepath, $images)) {
return array(

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/02/16 16:46:59 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/02/18 12:19:11 espie Exp $
@owner www
@group www
${DRUPAL_MODS}/image/
@ -14,8 +14,10 @@ ${DRUPAL_MODS}/image/contrib/image_attach/image_attach.install
${DRUPAL_MODS}/image/contrib/image_attach/image_attach.module
${DRUPAL_MODS}/image/contrib/image_attach/po/
${DRUPAL_MODS}/image/contrib/image_attach/po/da.po
${DRUPAL_MODS}/image/contrib/image_attach/po/de.po
${DRUPAL_MODS}/image/contrib/image_attach/po/image_attach-module.hu.po
${DRUPAL_MODS}/image/contrib/image_attach/po/image_attach-module.sl.po
${DRUPAL_MODS}/image/contrib/image_attach/po/image_attach.pot
${DRUPAL_MODS}/image/contrib/image_gallery/
${DRUPAL_MODS}/image/contrib/image_gallery/image_gallery.css
${DRUPAL_MODS}/image/contrib/image_gallery/image_gallery.info
@ -23,23 +25,29 @@ ${DRUPAL_MODS}/image/contrib/image_gallery/image_gallery.install
${DRUPAL_MODS}/image/contrib/image_gallery/image_gallery.module
${DRUPAL_MODS}/image/contrib/image_gallery/po/
${DRUPAL_MODS}/image/contrib/image_gallery/po/da.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.de.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/de.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.es.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.he.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.hu.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.sk.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery-module.sl.po
${DRUPAL_MODS}/image/contrib/image_gallery/po/image_gallery.pot
${DRUPAL_MODS}/image/contrib/image_im_advanced/
${DRUPAL_MODS}/image/contrib/image_im_advanced/image_im_advanced.info
${DRUPAL_MODS}/image/contrib/image_im_advanced/image_im_advanced.module
${DRUPAL_MODS}/image/contrib/image_im_advanced/po/
${DRUPAL_MODS}/image/contrib/image_im_advanced/po/de.po
${DRUPAL_MODS}/image/contrib/image_im_advanced/po/image_im_advanced.pot
${DRUPAL_MODS}/image/contrib/image_import/
${DRUPAL_MODS}/image/contrib/image_import/image_import.info
${DRUPAL_MODS}/image/contrib/image_import/image_import.install
${DRUPAL_MODS}/image/contrib/image_import/image_import.module
${DRUPAL_MODS}/image/contrib/image_import/po/
${DRUPAL_MODS}/image/contrib/image_import/po/da.po
${DRUPAL_MODS}/image/contrib/image_import/po/de.po
${DRUPAL_MODS}/image/contrib/image_import/po/image_import-module.hu.po
${DRUPAL_MODS}/image/contrib/image_import/po/image_import-module.sl.po
${DRUPAL_MODS}/image/contrib/image_import/po/image_import.pot
${DRUPAL_MODS}/image/image.imagemagick.inc
${DRUPAL_MODS}/image/image.info
${DRUPAL_MODS}/image/image.install