Refs Elgg #4524. Let's have it for 1.8 in Lorea.

diff --git a/mod/audio_html5 b/mod/audio_html5
index ad0149bc78bf67809d9c2636fe05987e2598b0c7..fdc3e162bb551ef0b5f961cef9ec838a38f672a1 160000 (submodule)
--- 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 1201292762ed0eb7364b9812cd1605c04abe67c4..8a2901f4c04f80d598eb1944378c57a1a51cec64 100644 (file)
--- 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
+}