Merge branch 'master' of github.com:Elgg/Elgg

3 files changed, 9 insertions, 10 deletions

diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index b55fb11d0..1b9d71c56 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -43,7 +43,7 @@ $english = array(
 	 */
 	'thewire:posted' => "Your message was successfully posted to the wire.",
 	'thewire:deleted' => "The wire post was successfully deleted.",
-	'thewire:blank' => "Sorry, you need to enter come text before we can post this.",
+	'thewire:blank' => "Sorry, you need to enter some text before we can post this.",
 	'thewire:notfound' => "Sorry, we could not find the specified wire post.",
 	'thewire:notdeleted' => "Sorry. We could not delete this wire post.",
 
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 770f8bce0..0e6bd7794 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -12,7 +12,7 @@
  * Nathan Koterba
  */
 
-register_elgg_event_handler('init', 'system', 'thewire_init');
+elgg_register_event_handler('init', 'system', 'thewire_init');
 
 /**
  * The Wire initialization
@@ -52,24 +52,23 @@ function thewire_init() {
 	// Register a URL handler for thewire posts
 	elgg_register_entity_url_handler('object', 'thewire', 'thewire_url');
 
-	// Your thewire widget
-	add_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));
+	elgg_register_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));
 
-	// Register entity type
+	// Register for search
 	elgg_register_entity_type('object', 'thewire');
 
 	// Register granular notification for this type
 	register_notification_object('object', 'thewire', elgg_echo('thewire:notify:subject'));
 
 	// Listen to notification events and supply a more useful message
-	register_plugin_hook('notify:entity:message', 'object', 'thewire_notify_message');
+	elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'thewire_notify_message');
 
 	// Register actions
 	$action_base = $CONFIG->pluginspath . 'thewire/actions';
-	register_action("thewire/add", false, "$action_base/add.php");
-	register_action("thewire/delete", false, "$action_base/delete.php");
+	elgg_register_action("thewire/add", "$action_base/add.php");
+	elgg_register_action("thewire/delete", "$action_base/delete.php");
 
-	register_plugin_hook('unit_test', 'system', 'thewire_test');
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'thewire_test');
 }
 
 /**
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 7beb197ee..3ae347711 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -51,7 +51,7 @@ $params = array(
 	'content' => thewire_filter($post->description),
 	'tags' => false,
 );
-$list_body = elgg_view('page/components/summary', $params);
+$list_body = elgg_view('object/elements/summary', $params);
 
 echo elgg_view_image_block($owner_icon, $list_body);