mirror of
https://github.com/e107inc/e107.git
synced 2025-04-30 09:18:09 +02:00
Merge pull request #4730 from Jimmi08/master
Closes #4659 forum main admin as silent moderator
This commit is contained in:
commit
33d87efd20
@ -535,7 +535,7 @@ class e107forum
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if user has moderator permissions for this thread
|
// Check if user has moderator permissions for this thread
|
||||||
if(!in_array(USERID, $moderatorUserIds))
|
if(!in_array(USERID, $moderatorUserIds) && !getperms('0'))
|
||||||
{
|
{
|
||||||
$ret['msg'] = ''.LAN_FORUM_8030.'';
|
$ret['msg'] = ''.LAN_FORUM_8030.'';
|
||||||
$ret['hide'] = false;
|
$ret['hide'] = false;
|
||||||
|
@ -80,7 +80,7 @@ class forum_post_handler
|
|||||||
$moderatorUserIds = $forum->getModeratorUserIdsByThreadId($this->id);
|
$moderatorUserIds = $forum->getModeratorUserIdsByThreadId($this->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds)));
|
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds) || getperms('0')));
|
||||||
|
|
||||||
|
|
||||||
$this->data = $this->processGet();
|
$this->data = $this->processGet();
|
||||||
|
@ -234,7 +234,7 @@ function init()
|
|||||||
}
|
}
|
||||||
|
|
||||||
$moderatorUserIds = $forum->getModeratorUserIdsByForumId($forumId);
|
$moderatorUserIds = $forum->getModeratorUserIdsByForumId($forumId);
|
||||||
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds)));
|
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds) || getperms('0')));
|
||||||
|
|
||||||
if(MODERATOR)
|
if(MODERATOR)
|
||||||
{
|
{
|
||||||
|
@ -86,8 +86,7 @@ $thread->init();
|
|||||||
|
|
||||||
/* Check if use has moderator permissions for this thread */
|
/* Check if use has moderator permissions for this thread */
|
||||||
$moderatorUserIds = $forum->getModeratorUserIdsByThreadId($thread->threadInfo['thread_id']);
|
$moderatorUserIds = $forum->getModeratorUserIdsByThreadId($thread->threadInfo['thread_id']);
|
||||||
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds)));
|
define('MODERATOR', (USER && in_array(USERID, $moderatorUserIds) || getperms('0') ));
|
||||||
|
|
||||||
|
|
||||||
if(e_AJAX_REQUEST)
|
if(e_AJAX_REQUEST)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user