From 5da1b3002e12ed112c92c0902f518c82bdd3fbe0 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Sun, 20 May 2012 02:30:26 +0200
Subject: Refs Elgg #4524. Let's have it for 1.8 in Lorea.

---
 mod/audio_html5    |  2 +-
 mod/file/start.php | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mod')

diff --git a/mod/audio_html5 b/mod/audio_html5
index ad0149bc7..fdc3e162b 160000
--- a/mod/audio_html5
+++ b/mod/audio_html5
@@ -1 +1 @@
-Subproject commit ad0149bc78bf67809d9c2636fe05987e2598b0c7
+Subproject commit fdc3e162bb551ef0b5f961cef9ec838a38f672a1
diff --git a/mod/file/start.php b/mod/file/start.php
index 120129276..8a2901f4c 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -200,13 +200,9 @@ function file_notify_message($hook, $entity_type, $returnvalue, $params) {
 	if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'file')) {
 		$descr = $entity->description;
 		$title = $entity->title;
+		$url = elgg_get_site_url() . "view/" . $entity->guid;
 		$owner = $entity->getOwnerEntity();
-		return elgg_echo('file:notification', array(
-			$owner->name,
-			$title,
-			$descr,
-			$entity->getURL()
-		));
+		return $owner->name . ' ' . elgg_echo("file:via") . ': ' . $entity->title . "\n\n" . $descr . "\n\n" . $entity->getURL();
 	}
 	return null;
 }
@@ -237,6 +233,10 @@ function file_owner_block_menu($hook, $type, $return, $params) {
  * @return string The overall type
  */
 function file_get_simple_type($mimetype) {
+		
+	if ($simpletype = elgg_trigger_plugin_hook('file:simpletype', $mimetype, null, null)) {
+		return $simpletype;
+	}
 
 	switch ($mimetype) {
 		case "application/msword":
@@ -402,4 +402,4 @@ function file_icon_url_override($hook, $type, $returnvalue, $params) {
 		$url = elgg_trigger_plugin_hook('file:icon:url', 'override', $params, $url);
 		return $url;
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3