Merge pull request #5 from EllisLab/v6

v6 compat update

Author: robinsowell

system/user/addons/wiki/addon.setup.php

@@ -2,10 +2,10 @@
 
 return array(
 	'author'      => 'EllisLab',
-	'author_url'  => 'http://ellislab.com/',
+	'author_url'  => 'https://expressionengine.com/',
 	'name'        => 'Wiki',
 	'description' => '',
-	'version'     => '4.0.0',
+	'version'     => '5.0.0',
 	'namespace'   => 'User\Addons\Wiki',
 	'settings_exist' => TRUE,
 	'docs_url'    => 'https://github.com/EllisLab/Wiki/wiki',

system/user/addons/wiki/language/english/wiki_lang.php

@@ -29,12 +29,12 @@
 
 'namespace_admins' => 'Admins',
 
-'namespace_admins_desc' => 'Member groups to administrate this namespace.<br>
+'namespace_admins_desc' => 'Member roles to administrate this namespace.<br>
 Super Administrators are automatically administrators.',
 
-'namespace_users_desc' => 'Member groups that can access this namespace',
+'namespace_users_desc' => 'Member roles that can access this namespace',
 
-'users_description' => 'Member groups that can access this wiki.',
+'users_description' => 'Member roles that can access this wiki.',
 
 'admins_description' => 'Member groups to administrate this wiki.<br>
 Super Administrators are automatically administrators.',
@@ -128,7 +128,7 @@
 
 'basepath_unset' => 'Base Path Parameter Not Set',
 
-'users' => 'Groups',
+'users' => 'Roles',
 
 'admins' => 'Administrators',
 

system/user/addons/wiki/mcp.wiki.php

@@ -242,11 +242,14 @@ function delete()
 
 	function get_member_groups()
 	{
-		$this->member_groups = ee('Model')->get('MemberGroup')
-			->filter('group_id', 'NOT IN', array(1,2,3,4))
-			->filter('site_id', ee()->config->item('site_id'))
-			->order('group_title')
-			->all();
+		// update for v6 return primary member roles
+		
+        $this->member_groups = ee('Model')->get('Role')
+            ->filter('role_id', 'NOT IN', array('2', '3', '4'))
+            ->order('name')
+            ->all();		
+	
+		
 	}
 
 	// -------------------------------------------------------------------------
@@ -464,7 +467,7 @@ function make_form($wiki_id, $wiki = NULL)
 		$member_group_options = array();
 		foreach ($this->member_groups as $group)
 		{
-			$member_group_options[$group->group_id] = $group->group_title;
+			$member_group_options[$group->role_id] = $group->name;
 		}
 
 
@@ -683,7 +686,7 @@ private function getNamespaceGrid($wiki_id = NULL)
 
 		foreach ($this->member_groups as $group)
 		{
-			$member_choices[$group->group_id] = $group->group_title;
+			$member_choices[$group->role_id] = $group->name;
 		}
 
 		$grid->setBlankRow($this->getGridRow($member_choices));