diff --git a/system/user/addons/wiki/addon.setup.php b/system/user/addons/wiki/addon.setup.php
index 6f0d950..bcc6a1f 100644
--- a/system/user/addons/wiki/addon.setup.php
+++ b/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',
diff --git a/system/user/addons/wiki/language/english/wiki_lang.php b/system/user/addons/wiki/language/english/wiki_lang.php
index f8b3060..5806016 100644
--- a/system/user/addons/wiki/language/english/wiki_lang.php
+++ b/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.
+'namespace_admins_desc' => 'Member roles to administrate this namespace.
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.
Super Administrators are automatically administrators.',
@@ -128,7 +128,7 @@
'basepath_unset' => 'Base Path Parameter Not Set',
-'users' => 'Groups',
+'users' => 'Roles',
'admins' => 'Administrators',
diff --git a/system/user/addons/wiki/mcp.wiki.php b/system/user/addons/wiki/mcp.wiki.php
index 183f757..40246fa 100644
--- a/system/user/addons/wiki/mcp.wiki.php
+++ b/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));
diff --git a/system/user/addons/wiki/mod.wiki.php b/system/user/addons/wiki/mod.wiki.php
index e21c6c9..aa16e73 100644
--- a/system/user/addons/wiki/mod.wiki.php
+++ b/system/user/addons/wiki/mod.wiki.php
@@ -252,38 +252,32 @@ function __construct($return = FALSE)
if ( ! empty($this->upload_dir) && is_numeric($this->upload_dir))
{
- $query = ee()->db->query("SELECT COUNT(*) AS count FROM exp_upload_prefs
- WHERE id = '".ee()->db->escape_str($this->upload_dir)."'");
+
+ // Check they have permission for this directory and get directory info
+ ee()->load->library('filemanager');
+ $upload_directory = ee()->filemanager->fetch_upload_dir_prefs($this->upload_dir);
- if ($query->row('count') > 0)
- {
+ // If this directory doesn't exist then we can't do anything
+ if (! empty($upload_directory)) {
+
$this->valid_upload_dir = 'y';
$this->can_upload = 'y';
- if (in_array(ee()->session->userdata['group_id'], array(2, 3, 4)))
- {
+ if ($this->has_role(array(2, 3, 4), TRUE)) {
$this->can_upload = 'n';
}
- elseif (ee()->session->userdata['group_id'] != 1)
- {
- $query = ee()->db->query("SELECT upload_id FROM exp_upload_no_access WHERE member_group = '".ee()->session->userdata['group_id']."'");
+ elseif (! ee('Permission')->isSuperAdmin()) {
+ ee()->db->select('upload_id');
+ ee()->db->where_in('role_id', $this->get_role_ids());
+ $access = ee()->db->get_where('upload_prefs_roles', array('upload_id' => $this->upload_dir));
- if ($query->num_rows() > 0)
- {
- foreach($query->result_array() as $row)
- {
- if ($query->row('upload_id') == $this->upload_dir)
- {
- $this->can_upload = 'n';
- break;
- }
- }
+ if ($access->num_rows() == 0) {
+ $this->can_upload = 'n';
}
- }
+ }
}
}
-
-
+
/** ----------------------------------------
/** Set theme, load file helper
/** ----------------------------------------*/
@@ -477,7 +471,7 @@ function __construct($return = FALSE)
$this->return_data = $this->_deny_if('logged_out', $this->return_data);
}
- if (in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->admins))
{
$this->return_data = $this->_deny_if('cannot_admin', $this->return_data);
$this->return_data = $this->_allow_if('can_admin', $this->return_data);
@@ -611,6 +605,32 @@ function __construct($return = FALSE)
$this->return_data = $this->_deny_if('redirect_page', $this->return_data);
}
+
+
+ public function has_role($roles, $strict = FALSE)
+ {
+ if (ee('Permission')->isSuperAdmin() && $strict == FALSE) {
+ return TRUE;
+ }
+
+ if (ee('Permission')->hasAnyRole($roles)) {
+ return TRUE;
+ }
+
+ return FALSE;
+ }
+
+ public function get_role_ids()
+ {
+ $user = ee()->session->getMember();
+ $user_role_ids = (empty($user)) ? array() : $user->getAllRoles()->pluck('role_id');
+
+ return $user_role_ids;
+
+ }
+
+
+
// --------------------------------------------------------------------
@@ -635,7 +655,7 @@ function _fetch_template($which)
/** Redirect for the Wiki
/** ----------------------------------------*/
- function redirect($namespace='', $title)
+ public function redirect($namespace='', $title)
{
ee()->functions->redirect($this->create_url($namespace, $title));
exit;
@@ -716,7 +736,7 @@ function prep_title($str)
/** Create Valid Topic Name
/** ----------------------------------------*/
- function valid_title($str)
+ public function valid_title($str)
{
// Remove all numeric entities
$str = preg_replace('/&#x([0-9a-f]{2,5});{0,1}|&#([0-9]{2,4});{0,1}/', '', $str);
@@ -899,7 +919,6 @@ function image($topic, $return=FALSE)
}
-
/** ----------------------------------------
/** File
/** ----------------------------------------*/
@@ -915,7 +934,7 @@ function file($topic)
if (isset($this->seg_parts['1']) && strtolower($this->seg_parts['1']) == 'delete')
{
- if ($this->can_upload == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->can_upload == 'y' && $this->has_role($this->admins))
{
ee('Model')->get('wiki:Upload')
->filter('file_name', $topic)
@@ -1020,7 +1039,7 @@ function file($topic)
{
$file_url = $this->base_url.$query->row('file_hash');
- if (in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->admins))
{
$delete_url = $this->base_url.$this->file_ns.':'.$query->row('file_name').'/delete';
}
@@ -1035,7 +1054,7 @@ function file($topic)
/** Can User Edit File?
/** ----------------------------------------*/
- if(in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins))
+ if($this->has_role($this->users) OR $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -1158,7 +1177,7 @@ function special($topic)
* @access public
* @return void
*/
- function wiki_css()
+ public function wiki_css()
{
// reset! We just want the CSS
$this->return_data = $this->_fetch_template('wiki_style.css');
@@ -1434,7 +1453,7 @@ function title_list($type = '')
/** Recent Changes Processing
/** ----------------------------------------*/
- function recent_changes($type='')
+ public function recent_changes($type='')
{
/** ----------------------------------------
/** Load Template, Check for Valid Tag
@@ -2058,7 +2077,7 @@ function find_parents($cat_id, $base_cat)
/** Edit
/** ----------------------------------------*/
- function edit($title)
+ public function edit($title)
{
/** ----------------------------------------
/** Revision Edit
@@ -2145,7 +2164,7 @@ function edit($title)
$this->return_data = $this->_deny_if('can_edit', $this->return_data);
$this->return_data = $this->_allow_if('cannot_edit', $this->return_data);
}
- elseif($query->num_rows() == 0 && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ elseif($query->num_rows() == 0 && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2155,12 +2174,12 @@ function edit($title)
$this->return_data = $this->_deny_if('can_edit', $this->return_data);
$this->return_data = $this->_allow_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ elseif($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2352,12 +2371,12 @@ function edit_revision($revision_id, $title)
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ if($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2437,7 +2456,7 @@ function history($title)
if ($query->num_rows() > 0)
{
- $xsql = (in_array(ee()->session->userdata['group_id'], $this->admins)) ? '' : " AND r.revision_status = 'open' ";
+ $xsql = ($this->has_role($this->admins)) ? '' : " AND r.revision_status = 'open' ";
$results = ee()->db->query("SELECT r.*, m.screen_name
FROM exp_wiki_revisions r, exp_members m
@@ -2495,17 +2514,17 @@ function history($title)
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if($query->num_rows() == 0 && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ if($query->num_rows() == 0 && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ elseif($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2633,7 +2652,7 @@ function new_article($title, $original_page='')
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if(in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins))
+ if($this->has_role($this->users) OR $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2677,7 +2696,7 @@ function new_article($title, $original_page='')
/** Article
/** ----------------------------------------*/
- function article($title)
+ public function article($title)
{
$redirects = array();
@@ -2721,12 +2740,12 @@ function article($title)
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ if($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -2859,12 +2878,12 @@ function article($title)
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ if($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -3287,7 +3306,7 @@ function category_page()
/** Parse Dates Out of String
/** ----------------------------------------*/
- function parse_dates($str)
+ public function parse_dates($str)
{
$dates = array();
@@ -3366,7 +3385,7 @@ function revision($title)
return $this->article($title);
}
- $xsql = (in_array(ee()->session->userdata['group_id'], $this->admins)) ? '' : " AND r.revision_status = 'open' ";
+ $xsql = ($this->has_role($this->admins)) ? '' : " AND r.revision_status = 'open' ";
$results = ee()->db->query("SELECT r.*, m.screen_name
FROM exp_wiki_revisions r, exp_members m
@@ -3434,12 +3453,12 @@ function revision($title)
/* Everyone Else, No EDIT!
/* ----------------------------------------*/
- if($query->row('page_locked') != 'y' && (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins)))
+ if($query->row('page_locked') != 'y' && ($this->has_role($this->users) OR $this->has_role($this->admins)))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
}
- elseif($query->row('page_locked') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ elseif($query->row('page_locked') == 'y' && $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -3487,7 +3506,7 @@ function active_members($str)
if ($v['1'] == 'y')
{
- if (ee()->session->userdata['group_id'] == 1)
+ if (ee('Permission')->isSuperAdmin())
{
$temp = str_replace('{name}', $v['0'].'*', $temp);
}
@@ -3544,14 +3563,14 @@ function _allow_if($cond, $str)
/** -------------------------------------
/** Edit Article
/** -------------------------------------*/
- function edit_article()
+ public function edit_article()
{
if (ee()->input->post('editing') === FALSE OR ee()->input->get_post('title') === FALSE OR ee()->input->get_post('title') == '' OR ee()->input->get_post('article_content') === FALSE)
{
return ee()->output->show_user_error('general', array(lang('invalid_permissions')));
}
- if ( ! in_array(ee()->session->userdata['group_id'], $this->users) && ! in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ( ! $this->has_role($this->users) && ! $this->has_role($this->admins))
{
return ee()->output->show_user_error('general', array(lang('invalid_permissions')));
}
@@ -3587,7 +3606,7 @@ function edit_article()
'last_updated' => ee()->localize->now,
'wiki_id' => $this->wiki_id);
- if (in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->admins))
{
if (ee()->input->get_post('delete_article') == 'y' && $this->current_namespace == $this->category_ns)
{
@@ -3646,7 +3665,7 @@ function edit_article()
{
$page_id = $query->row('page_id') ;
- if (ee()->input->get_post('delete_article') == 'y' && in_array(ee()->session->userdata['group_id'], $this->admins))
+ if (ee()->input->get_post('delete_article') == 'y' && $this->has_role($this->admins))
{
if ($this->current_namespace == $this->category_ns)
{
@@ -3682,12 +3701,12 @@ function edit_article()
$this->redirect('', $this->title);
}
- if ($query->row('page_locked') == 'y' && ! in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($query->row('page_locked') == 'y' && ! $this->has_role($this->admins))
{
return ee()->output->show_user_error('general', array(lang('invalid_permissions')));
}
- if ($query->row('page_moderated') == 'y' && ! in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($query->row('page_moderated') == 'y' && ! $this->has_role($this->admins))
{
$data = array('last_updated' => $query->row('last_updated') );
}
@@ -3701,7 +3720,7 @@ function edit_article()
$data['page_redirect'] = $this->valid_title(ee()->input->get_post('redirect'));
}
- if (in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->admins))
{
$data['page_locked'] = (ee()->input->get_post('lock_article') == 'y') ? 'y' : 'n';
$data['page_moderated'] = (ee()->input->get_post('moderate_article') == 'y') ? 'y' : 'n';
@@ -3769,7 +3788,7 @@ function edit_article()
'page_content' => ee('Security/XSS')->clean($content)
);
- if ($query->num_rows() > 0 && $query->row('page_moderated') == 'y' && ! in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($query->num_rows() > 0 && $query->row('page_moderated') == 'y' && ! $this->has_role($this->admins))
{
$revision['revision_status'] = 'closed';
}
@@ -4786,7 +4805,7 @@ function upload_form()
if (ee()->input->post('upload') == 'y')
{
- if( ! in_array(ee()->session->userdata('group_id'), $this->users) && ! in_array(ee()->session->userdata('group_id'), $this->admins))
+ if( ! $this->has_role($this->users) && ! $this->has_role($this->admins))
{
return FALSE;
}
@@ -4820,7 +4839,7 @@ function upload_form()
$config = array(
'file_name' => $new_name,
'upload_path' => $server_path,
- 'max_size' => round($upload_prefs['max_size']/1024, 3),
+ 'max_size' => round((int) $upload_prefs['max_size']/1024, 3),
'max_width' => $upload_prefs['max_width'],
'max_height' => $upload_prefs['max_height'],
);
@@ -4836,7 +4855,7 @@ function upload_form()
}
else
{
- $config['xss_clean'] = (ee()->session->userdata('group_id') == 1) ? FALSE : TRUE;
+ $config['xss_clean'] = (ee('Permission')->isSuperAdmin()) ? FALSE : TRUE;
}
ee()->load->library('upload', $config);
@@ -4905,7 +4924,7 @@ function upload_form()
/** Can User Edit Articles and Thus Upload?
/** ----------------------------------------*/
- if (in_array(ee()->session->userdata['group_id'], $this->users) OR in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->users) OR $this->has_role($this->admins))
{
$this->return_data = $this->_allow_if('can_edit', $this->return_data);
$this->return_data = $this->_deny_if('cannot_edit', $this->return_data);
@@ -4949,7 +4968,7 @@ function upload_form()
function edit_limit()
{
- if ( ! in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ( ! $this->has_role($this->admins))
{
$query = ee()->db->query("SELECT COUNT(revision_id) AS count FROM exp_wiki_revisions
WHERE revision_author = '".ee()->db->escape_str(ee()->session->userdata['member_id'])."'
@@ -4973,7 +4992,7 @@ function edit_limit()
function open_close_revision($title, $revision_id, $new_status)
{
- if (in_array(ee()->session->userdata['group_id'], $this->admins))
+ if ($this->has_role($this->admins))
{
$query = ee()->db->query("SELECT r.page_id, r.page_content, p.page_namespace FROM exp_wiki_revisions r, exp_wiki_page p
WHERE r.revision_id = '".ee()->db->escape_str($revision_id)."'
diff --git a/system/user/addons/wiki/models/wiki_model.php b/system/user/addons/wiki/models/wiki_model.php
index e491112..d5d5b24 100644
--- a/system/user/addons/wiki/models/wiki_model.php
+++ b/system/user/addons/wiki/models/wiki_model.php
@@ -182,19 +182,16 @@ function fetch_upload_options($value = '')
*/
function member_group_options()
{
- $this->db->select('group_title, group_id');
- $this->db->where_not_in('group_id', array('2', '3', '4'));
- $this->db->where('site_id', $this->config->item('site_id'));
- $query = $this->db->get('member_groups');
-
- $options = array();
-
- foreach($query->result() as $row)
- {
- $options[$row->group_id] = $row->group_title;
- }
+ // update for v6, return roles
+
+ $roles = ee('Model')->get('Role')
+ ->filter('role_id', 'NOT IN', array('2', '3', '4'))
+ ->order('name')
+ ->all()
+ ->getDictionary('role_id', 'name');
- return $options;
+ return $roles;
+
}
// ------------------------------------------------------------------------
diff --git a/system/user/addons/wiki/upd.wiki.php b/system/user/addons/wiki/upd.wiki.php
index f28a851..8f0d7ae 100644
--- a/system/user/addons/wiki/upd.wiki.php
+++ b/system/user/addons/wiki/upd.wiki.php
@@ -24,7 +24,7 @@
*/
class Wiki_upd {
- var $version = '4.0.0';
+ var $version = '5.0.0';
/**
* Module Installer
@@ -157,7 +157,7 @@ function uninstall()
{
$query = ee()->db->query("SELECT module_id FROM exp_modules WHERE module_name = 'Wiki'");
- $sql[] = "DELETE FROM exp_module_member_groups WHERE module_id = '".$query->row('module_id') ."'";
+ $sql[] = "DELETE FROM exp_module_member_roles WHERE module_id = '".$query->row('module_id') ."'";
$sql[] = "DELETE FROM exp_modules WHERE module_name = 'Wiki'";
$sql[] = "DELETE FROM exp_actions WHERE class = 'Wiki'";
$sql[] = "DROP TABLE IF EXISTS exp_wiki_page";
diff --git a/themes/user/wiki_themes/azure/wiki_page.html b/themes/user/wiki_themes/azure/wiki_page.html
index 7aa9d0f..20cb135 100644
--- a/themes/user/wiki_themes/azure/wiki_page.html
+++ b/themes/user/wiki_themes/azure/wiki_page.html
@@ -161,8 +161,8 @@ {lang:navigation}
{lang:random_page}
{if uploads}
{lang:file_upload}
-{lang:uploaded_files}
{/if}
+{lang:uploaded_files}
{lang:recent_changes}
{lang:rss}
{lang:atom}
diff --git a/themes/user/wiki_themes/default/wiki_page.html b/themes/user/wiki_themes/default/wiki_page.html
index 035be14..799ff8a 100644
--- a/themes/user/wiki_themes/default/wiki_page.html
+++ b/themes/user/wiki_themes/default/wiki_page.html
@@ -82,8 +82,8 @@ {lang:navigation}
· {lang:random_page}
{if uploads}
· {lang:file_upload}
- · {lang:uploaded_files}
{/if}
+ · {lang:uploaded_files}
· {lang:recent_changes}
· {lang:rss}
· {lang:atom}