mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

The $goodtoken thing is important, as when this is used, the user is not logged in, and so the comment approval via token

Browse Source 
would not work (at least this is how I read it, I didn't implement the token approval)
This commit is contained in:
Garvin Hicking 2011-12-31 15:10:00 +01:00
parent 5c062c4f0b
commit de6f589f96
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions_comments.inc.php
View File

@ -539,19 +539,17 @@ function serendipity_deleteComment($id, $entry_id, $type='comments', $token=fals
if ($_SESSION['serendipityAuthedUser'] === true || $goodtoken) {
// Check for adminEntriesMaintainOthers
if (!serendipity_checkPermission('adminEntriesMaintainOthers')) {
$admin = '';
if (!$goodtoken && !serendipity_checkPermission('adminEntriesMaintainOthers')) {
$admin = " AND authorid = " . (int)$_SESSION['serendipityAuthorid'];
// Load articles author id and check it
$sql = serendipity_db_query("SELECT authorid FROM {$serendipity['dbPrefix']}entries
WHERE entry_id = ". $entry_id, true);
if ($sql['authorid'] != $serendipity['authorid']) {
return false; // wrong user having no adminEntriesMaintainOthers right
}
}
$admin = '';
if (!$goodtoken && !serendipity_checkPermission('adminEntriesMaintainOthers')) {
$admin = " AND authorid = " . (int)$_SESSION['serendipityAuthorid'];
}
/* We have to figure out if the comment we are about to delete, is awaiting approval,