Upgraded depracated functions

2 files changed, 10 insertions, 8 deletions

diff --git a/index.php b/index.php
index 74ea69371..660200d8f 100644
--- a/index.php
+++ b/index.php
@@ -1,13 +1,15 @@
 <?php
 	$offset = (int)get_input('offset', 0);
 	$title = elgg_echo("dokuwiki:title");
-	$body = elgg_view_title($title);
-        $objects = elgg_list_entities(array('subtype'=>'dokuwiki', 'offset'=>$offset, 'types'=>'object','full_view'=>false));
-        $body .= $objects;
-        $body = elgg_view_layout('two_column_left_sidebar', '', $body, $area3);
+	$content = elgg_list_entities(array('subtype'=>'dokuwiki', 'offset'=>$offset, 'types'=>'object','full_view'=>false));
+	$body = elgg_view_layout('content', array(
+		'content' => $content,
+		'title' => $title,
+		'filter' => '',
+	));
 
-        // Finally draw the page
-        echo page_draw($title, $body);
+	// Finally draw the page
+	echo elgg_view_page($title, $body);
 
 
 ?>
diff --git a/start.php b/start.php
index 4822a8c01..2c495844f 100644
--- a/start.php
+++ b/start.php
@@ -17,7 +17,7 @@ function dokuwiki_init(){
 	
 	elgg_register_entity_type('object','dokuwiki');
 	elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'elggdokuwiki_icon_hook');
-	elgg_register_entity_url_handler('elggdokuwiki_url','object', 'dokuwiki');
+	elgg_register_entity_url_handler('object', 'dokuwiki', 'elggdokuwiki_url');
 
 	// add block link to
 	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'dokuwiki_owner_block_menu');
@@ -55,7 +55,7 @@ function dokuwiki_init(){
 		elgg_load_library('elgg:dokuwiki');
 		
 		if ($page[0] === "all") {
-			set_context("search");
+			elgg_set_context("search");
 			include(elgg_get_plugins_path().'dokuwiki/index.php');
 			return;
 		}