Merge branch 'master' of https://github.com/zacho/islandora into zacho-master

MimeClass.inc

@@ -163,6 +163,9 @@ class MimeClass {
     "mpeg"    => "video/mpeg",
     "mpe"     => "video/mpeg",
     "mpg"     => "video/mpeg",
+    "m4v"     => "video/mp4",
+    "mp4"     => "video/mp4",
+    "ogv"     => "video/ogg",
     "qt"      => "video/quicktime",
     "mov"     => "video/quicktime",
     "mxu"     => "video/vnd.mpegurl",
@@ -170,6 +173,14 @@ class MimeClass {
     "movie"   => "video/x-sgi-movie",
     "flv"     => "video/x-flv",
     "swf"     => "application/x-shockwave-flash",
+    // audio:
+    "mp3"     => "audio/mpeg",
+    "mp4a"    => "audio/mp4",
+    "m4a"     => "audio/mp4",
+    "oga"     => "audio/ogg",
+    "ogg"     => "audio/ogg",
+    "flac"    => "audio/x-flac",
+    "wav"     => "audio/vnd.wave",
     // compressed formats: (note: http://svn.cleancode.org/svn/email/trunk/mime.types)
     "tgz"     => "application/x-gzip",
     "gz"      => "application/x-gzip",
@@ -323,14 +334,3 @@ class MimeClass {
 
 }
 
-/*
-$helper = new MimeClass();
-print "get_extension('application/x-gzip'): \n";
-echo print_r( $helper->get_extension('application/x-gzip', true), true ) . "\n";
-print "get_extension('text/plain'): \n";
-echo print_r( $helper->get_extension('text/plain', true), true ) . "\n";
-print "get_mimetype('fucker/asdf.tar.gz'): \n";
-echo print_r( $helper->get_mimetype('fucker/asdf.tar.gz', true), true ) . "\n";
-print "get_mimetype('blah.tsp'): \n";
-echo print_r( $helper->get_mimetype('blah.tsp', true), true ) . "\n";
-/* */

plugins/pidfield/pidfield.module

@@ -276,12 +276,15 @@ function theme_pidfield_formatter_default($element) {
   //return $element['#item']['safe'];
   $pid = $element['#item']['safe'];
 
+  if(!empty($pid)) {
     module_load_include('inc', 'fedora_repository', 'api/fedora_item');
     $item = new Fedora_Item($pid);
 
     return fedora_repository_get_items($pid);
     //return $item->objectProfile->objLabel;
   }
+  return null;
+}
 
 /**
  * Theme function for 'plain' example field formatter.