Merge branch 'file_general_type_hook' of github.com:lorea/Elgg

diff --cc mod/file/start.php
index ad88469c8a10dc5f6ce33609ef416f730b522823,8c8883b6e721cf2e651db1153bf2ab179330e31d..6c1501bd28d6e540a1e03be2c65d2cefcbeaeaa8
--- 1/mod/file/start.php
--- 2/mod/file/start.php
+++ b/mod/file/start.php
@@@ -232,11 -232,11 +232,15 @@@ function file_owner_block_menu($hook, $
   * @return string The overall type
   */
  function file_get_simple_type($mimetype) {
+       
+       if($type = elgg_trigger_plugin_hook('file_simple_type', 'object', $params, null)) {
+               return $type;
+       }
  
 +      if($type = elgg_trigger_plugin_hook('file_simple_type', 'object', $params, null)) {
 +              return $type;
 +      }
 +
        switch ($mimetype) {
                case "application/msword":
                        return "document";