aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/blog/languages/en.php4
-rw-r--r--mod/custom_index/views/default/page/layouts/custom_index.php2
-rw-r--r--mod/notifications/start.php4
-rw-r--r--mod/tinymce/start.php4
4 files changed, 7 insertions, 7 deletions
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index 47dc57dda..8a21c1f8d 100644
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -53,10 +53,12 @@ $english = array(
'blog:error:revision_not_found' => 'Cannot find this revision.',
// river
-
'river:create:object:blog' => '%s published a blog post %s',
'river:comment:object:blog' => '%s commented on the blog %s',
+ // notifications
+ 'blog:newpost' => 'A new blog post',
+
// widget
'blog:widget:description' => 'Display your latest blog posts',
'blog:moreblogs' => 'More blog posts',
diff --git a/mod/custom_index/views/default/page/layouts/custom_index.php b/mod/custom_index/views/default/page/layouts/custom_index.php
index 0883e7274..6b3f6d739 100644
--- a/mod/custom_index/views/default/page/layouts/custom_index.php
+++ b/mod/custom_index/views/default/page/layouts/custom_index.php
@@ -17,7 +17,7 @@
// Top box for login or welcome message
if (elgg_is_logged_in()) {
$top_box = "<h2>" . elgg_echo("welcome") . " ";
- $top_box .= get_loggedin_user()->name;
+ $top_box .= elgg_get_logged_in_user_entity()->name;
$top_box .= "</h2>";
} else {
$top_box = $vars['login'];
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index 0f1e11a57..c6701cc3e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -1,11 +1,11 @@
<?php
-
/**
* Elgg notifications plugin
*
* @package ElggNotifications
*/
+elgg_register_event_handler('init', 'system', 'notifications_plugin_init');
function notifications_plugin_init() {
@@ -187,5 +187,3 @@ function notifications_update_collection_notify($event, $object_type, $returnval
}
}
}
-
-elgg_register_event_handler('init', 'system', 'notifications_plugin_init', 1000);
diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php
index 3b662308a..ee7154d22 100644
--- a/mod/tinymce/start.php
+++ b/mod/tinymce/start.php
@@ -5,6 +5,8 @@
* @package ElggTinyMCE
*/
+elgg_register_event_handler('init', 'system', 'tinymce_init');
+
function tinymce_init() {
elgg_extend_view('css/elgg', 'tinymce/css');
elgg_extend_view('css/admin', 'tinymce/css');
@@ -30,5 +32,3 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) {
return $items;
}
-
-elgg_register_event_handler('init', 'system', 'tinymce_init', 9999);