Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 4 insertions, 2 deletions

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);
 	}