Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

5 files changed, 13 insertions, 11 deletions

diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 25c42ee93..617813725 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -8,11 +8,10 @@
 	<description>This plugin allows users to put a message board on their profile for other users to post comments.</description>
 	<website>http://www.elgg.org/</website>
 	<copyright>See COPYRIGHT.txt</copyright>
-	<license>GNU Public License version 2</license>
+	<license>GNU General Public License version 2</license>
 	<requires>
-		<type>elgg_version</type>
-		<version>2010030101</version>
+		<type>elgg_release</type>
+		<version>1.8</version>
 	</requires>
 	<activate_on_install>true</activate_on_install>
-	<admin_interface>simple</admin_interface>
 </plugin_manifest>
diff --git a/mod/messageboard/start.php b/mod/messageboard/start.php
index 8a7f00958..0c65edc4f 100644
--- a/mod/messageboard/start.php
+++ b/mod/messageboard/start.php
@@ -84,8 +84,10 @@ function messageboard_page_handler($page) {
 			set_input('page_owner_guid', $owner_guid);
 			include "$pages/owner.php";
 			break;
-	}
 
+		default:
+			return false;
+	}
 	return true;
 }
 
@@ -150,7 +152,7 @@ function messageboard_annotation_menu_setup($hook, $type, $return, $params) {
 			'href' => $url,
 			'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
 			'confirm' => elgg_echo('deleteconfirm'),
-			'text_encode' => false
+			'encode_text' => false
 		);
 		$return[] = ElggMenuItem::factory($options);
 	}
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index 5d89fcd69..3295c68de 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -13,7 +13,7 @@ elgg.messageboard.init = function() {
 		// double whammy for in case the load order changes.
 		.unbind('click', elgg.ui.requiresConfirmation)
 		.removeClass('elgg-requires-confirmation');
-}
+};
 
 elgg.messageboard.submit = function(e) {
 	var form = $(this).parents('form');
@@ -23,7 +23,7 @@ elgg.messageboard.submit = function(e) {
 		data: data,
 		success: function(json) {
 			// the action always returns the full ul and li wrapped annotation.
-			var ul = form.next('ul.elgg-annotation-list');
+			var ul = form.next('ul.elgg-list-annotation');
 
 			if (ul.length < 1) {
 				form.parent().append(json.output);
@@ -35,7 +35,7 @@ elgg.messageboard.submit = function(e) {
 	});
 
 	e.preventDefault();
-}
+};
 
 elgg.messageboard.deletePost = function(e) {
 	var link = $(this);
@@ -50,6 +50,6 @@ elgg.messageboard.deletePost = function(e) {
 	}
 
 	e.preventDefault();
-}
+};
 
 elgg.register_hook_handler('init', 'system', elgg.messageboard.init);
diff --git a/mod/messageboard/views/default/river/object/messageboard/create.php b/mod/messageboard/views/default/river/object/messageboard/create.php
index 975598805..7ce7f6b4e 100644
--- a/mod/messageboard/views/default/river/object/messageboard/create.php
+++ b/mod/messageboard/views/default/river/object/messageboard/create.php
@@ -5,7 +5,7 @@
 
 $messageboard = $vars['item']->getAnnotation();
 
-echo elgg_view('river/item', array(
+echo elgg_view('river/elements/layout', array(
 	'item' => $vars['item'],
 	'message' => $messageboard->value,
 ));
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 63f389e6a..35954e7a3 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -31,4 +31,5 @@ if ($owner instanceof ElggGroup) {
 echo elgg_view('output/url', array(
 	'href' => $url,
 	'text' => elgg_echo('messageboard:viewall'),
+	'is_trusted' => true,
 ));
\ No newline at end of file