aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-05-20 02:30:26 +0200
committerSem <sembrestels@riseup.net>2012-05-20 02:30:26 +0200
commit5da1b3002e12ed112c92c0902f518c82bdd3fbe0 (patch)
tree94cd450fa9fddb62e4589621cd7261d921c5a03c /mod
parent3133afbf27e8d46560f8293a8b821d81cc24ba4a (diff)
downloadelgg-5da1b3002e12ed112c92c0902f518c82bdd3fbe0.tar.gz
elgg-5da1b3002e12ed112c92c0902f518c82bdd3fbe0.tar.bz2
Refs Elgg #4524. Let's have it for 1.8 in Lorea.
Diffstat (limited to 'mod')
m---------mod/audio_html50
-rw-r--r--mod/file/start.php14
2 files changed, 7 insertions, 7 deletions
diff --git a/mod/audio_html5 b/mod/audio_html5
-Subproject ad0149bc78bf67809d9c2636fe05987e2598b0c
+Subproject fdc3e162bb551ef0b5f961cef9ec838a38f672a
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
+}