From: Sem <sembrestels@riseup.net>
Date: Thu, 5 Apr 2012 16:38:32 +0000 (+0200)
Subject: Merge branch 'file_general_type_hook' of github.com:lorea/Elgg
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=18de117e23e6adfdead7ad2a96ef7eb275668672;p=lorea%2Felgg.git

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

18de117e23e6adfdead7ad2a96ef7eb275668672
diff --cc mod/file/start.php
index ad88469c8,8c8883b6e..6c1501bd2
--- a/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";