Merge branch '2.6RC'

Zotlabs/Widget/Wiki_pages.php

@@ -11,14 +11,8 @@ class Wiki_pages {
 			return;
 
 		if(! $arr['resource_id']) {
-
-			$c = \App::get_channel();
-
-			if(! $c)
-				$c = channelx_by_nick(argv(1));
-
+			$c = channelx_by_nick(argv(1));
 			$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],argv(2));
-
 			$arr = array(
 				'resource_id' => $w['resource_id'],
 				'channel_id' => $c['channel_id'],
@@ -29,6 +23,8 @@ class Wiki_pages {
 
 		$wikiname = '';
 
+		$wikiname = '';
+
 		$pages = array();
 
 		$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);