diff options
| author | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-07-11 21:19:14 +0200 |
| commit | b83574ae1b8ada2bb9c2247492806473df920259 (patch) | |
| tree | 30f9010da3cab12bda4921f079cfe86fcef2e7a4 /engine/lib/river.php | |
| parent | 46bd104bd523c08ff2f6bc0342be9ae1251259e8 (diff) | |
| parent | 4d42fd0263948eee4a7c7a26ceca0647c01cce32 (diff) | |
| download | elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.gz elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.bz2 | |
Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.8 release
Conflicts:
js/lib/languages.js
Diffstat (limited to 'engine/lib/river.php')
| -rw-r--r-- | engine/lib/river.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 711832f70..b717a7756 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -643,9 +643,11 @@ function elgg_river_init() { elgg_register_page_handler('activity', 'elgg_river_page_handler'); $item = new ElggMenuItem('activity', elgg_echo('activity'), 'activity'); elgg_register_menu_item('site', $item); - + elgg_register_widget_type('river_widget', elgg_echo('river:widget:title'), elgg_echo('river:widget:description')); + elgg_register_action('river/delete', '', 'admin'); + elgg_register_plugin_hook_handler('unit_test', 'system', 'elgg_river_test'); } |