Browse Source

fixed /dev/null

pull/45/head
Ben Woodhead 13 years ago
parent
commit
c498a3f2b4
  1. 2
      api/fedora_collection.inc
  2. 2
      plugins/ImageManipulation.inc

2
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');

2
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\"";

Loading…
Cancel
Save