From c498a3f2b4a34baa2201314ed2084078e59d70a7 Mon Sep 17 00:00:00 2001 From: Ben Woodhead Date: Wed, 12 Oct 2011 15:51:46 -0300 Subject: [PATCH] fixed /dev/null --- api/fedora_collection.inc | 2 +- plugins/ImageManipulation.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/fedora_collection.inc b/api/fedora_collection.inc index b8afc5c4..a82bf39b 100644 --- a/api/fedora_collection.inc +++ b/api/fedora_collection.inc @@ -41,7 +41,7 @@ function export_collection($collection_pid, $relationship = 'isMemberOfCollectio fwrite($file, $item_foxml); fclose($file); } - if (system("cd $container;zip -r $collection_pid.zip $collection_pid/* >/dev/NULL") == 0) { + if (system("cd $container;zip -r $collection_pid.zip $collection_pid/* >/dev/null") == 0) { header("Content-type: application/zip"); header('Content-Disposition: attachment; filename="' . $collection_pid . '.zip' . '"'); $fh = fopen($container . '/' . $collection_pid . '.zip', 'r'); diff --git a/plugins/ImageManipulation.inc b/plugins/ImageManipulation.inc index 0351adbe..8f97ab94 100644 --- a/plugins/ImageManipulation.inc +++ b/plugins/ImageManipulation.inc @@ -211,7 +211,7 @@ class ImageManipulation { } elseif (stristr($_SERVER['SERVER_SOFTWARE'], 'unix')) { // Use this for Mac OS X (MAMP) - $cmdline = "sips -s format jpeg \"$file\" -z $height $height --out \"$file$file_suffix\" >/dev/NULL"; + $cmdline = "sips -s format jpeg \"$file\" -z $height $height --out \"$file$file_suffix\" >/dev/null"; } else { $cmdline = "convert \"$file\"\[0\] -colorspace RGB -thumbnail " . $width . "x" . $height . " \"$file$file_suffix\"";