diff options
Diffstat (limited to 'mod')
| m--------- | mod/admins | 0 | ||||
| m--------- | mod/audio_html5 | 0 | ||||
| m--------- | mod/custom_index_widgets | 6 | ||||
| m--------- | mod/dokuwiki | 6 | ||||
| m--------- | mod/elggpg | 0 | ||||
| m--------- | mod/etherpad | 0 | ||||
| -rw-r--r-- | mod/file/start.php | 14 | ||||
| m--------- | mod/friendrequest | 6 | ||||
| m--------- | mod/gifts | 0 | ||||
| m--------- | mod/group_alias | 0 | ||||
| m--------- | mod/group_operators | 0 | ||||
| m--------- | mod/identica | 6 | ||||
| m--------- | mod/infinite_scroll | 0 | ||||
| m--------- | mod/languages | 6 | ||||
| m--------- | mod/magic_topbar | 0 | ||||
| m--------- | mod/minify | 0 | ||||
| m--------- | mod/online | 0 | ||||
| m--------- | mod/opensearch | 6 | ||||
| m--------- | mod/powered | 0 | ||||
| m--------- | mod/registrationterms | 6 | ||||
| m--------- | mod/relatedgroups | 0 | ||||
| m--------- | mod/simple_faq | 0 | ||||
| m--------- | mod/spotlight | 0 | ||||
| m--------- | mod/subgroups | 0 | ||||
| m--------- | mod/suicide | 0 | ||||
| m--------- | mod/translation_editor | 0 | ||||
| m--------- | mod/videolist | 6 |
27 files changed, 55 insertions, 7 deletions
diff --git a/mod/admins b/mod/admins new file mode 160000 +Subproject 9e9c8853c055999e61d3e4b5cdfad2f8b100aba diff --git a/mod/audio_html5 b/mod/audio_html5 new file mode 160000 +Subproject fdc3e162bb551ef0b5f961cef9ec838a38f672a diff --git a/mod/custom_index_widgets b/mod/custom_index_widgets new file mode 160000 +Subproject 5bfffd40e5649baed964c2fe7b6c7cb5e6a1257 diff --git a/mod/dokuwiki b/mod/dokuwiki new file mode 160000 +Subproject 9e83610ec1836cbbd27e7584732ff5d21d95186 diff --git a/mod/elggpg b/mod/elggpg new file mode 160000 +Subproject c0361b9ad60cbb23bf0678df1d61053998ca348 diff --git a/mod/etherpad b/mod/etherpad new file mode 160000 +Subproject ba948befea5b739722f976d5fcffb370748d65e diff --git a/mod/file/start.php b/mod/file/start.php index 172042332..cc777d260 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": @@ -410,4 +410,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 +} diff --git a/mod/friendrequest b/mod/friendrequest new file mode 160000 +Subproject 5acba1ab8c4fac37dccf33cc47bcab61a96f5cb diff --git a/mod/gifts b/mod/gifts new file mode 160000 +Subproject 74c059ded697a014d5786ba087776dbf06914ef diff --git a/mod/group_alias b/mod/group_alias new file mode 160000 +Subproject 910c57a28e0248024bcb85359bb5a3b72e31ca6 diff --git a/mod/group_operators b/mod/group_operators new file mode 160000 +Subproject 65f5a354fa140dc7df43460905dc564d4323579 diff --git a/mod/identica b/mod/identica new file mode 160000 +Subproject 3e3ee5e9a79534ecacb686ff9b207881e557d05 diff --git a/mod/infinite_scroll b/mod/infinite_scroll new file mode 160000 +Subproject 96bdef76f1e3c27e392373b8152d471c88f46b8 diff --git a/mod/languages b/mod/languages new file mode 160000 +Subproject 8fb81a93e0eafe23c7bc486e8e1c6566d345569 diff --git a/mod/magic_topbar b/mod/magic_topbar new file mode 160000 +Subproject 0fdca8adb73fe9e2b5be69c00c15760c8fba336 diff --git a/mod/minify b/mod/minify new file mode 160000 +Subproject 594901859d5afc1fa364322428bd7a6d5c6a3f9 diff --git a/mod/online b/mod/online new file mode 160000 +Subproject af055124997d7346872647332237810e4aee5f6 diff --git a/mod/opensearch b/mod/opensearch new file mode 160000 +Subproject fdb19865380ee01989c97b48a3e505c1350512a diff --git a/mod/powered b/mod/powered new file mode 160000 +Subproject 76a03d73554d1d328d83a42d62774601d4f0795 diff --git a/mod/registrationterms b/mod/registrationterms new file mode 160000 +Subproject 08957cc28b07076c0dbc2ade3a3ed73e5a74493 diff --git a/mod/relatedgroups b/mod/relatedgroups new file mode 160000 +Subproject b0d7f86355c34c13fe366fea5f6bdaf81175e4c diff --git a/mod/simple_faq b/mod/simple_faq new file mode 160000 +Subproject b3a038c8ac7db28d5cd47a7ae870f722c24e592 diff --git a/mod/spotlight b/mod/spotlight new file mode 160000 +Subproject 4a552ade05f48b9b1052f70f0f6e57704a2f46d diff --git a/mod/subgroups b/mod/subgroups new file mode 160000 +Subproject 142e0ceed906d16f0c8ad79bc39db8c40871c62 diff --git a/mod/suicide b/mod/suicide new file mode 160000 +Subproject 162a741a8e3c0142ced466e3cc47d309a87b686 diff --git a/mod/translation_editor b/mod/translation_editor new file mode 160000 +Subproject 416e8aa510bb31574b70c16817f054e2111b5b9 diff --git a/mod/videolist b/mod/videolist new file mode 160000 +Subproject d2b3600e49bfac698042e39e6b6ac79124b1080 |