change topic delete to require board admin perm instead of edit - more in keeping with old separate remove perm - plus content_id bug fix in edit_topic

1 files changed, 2 insertions, 1 deletions

diff --git a/edit_topic.php b/edit_topic.php
index be760c6..efce82a 100644
--- a/edit_topic.php
+++ b/edit_topic.php
@@ -18,6 +18,7 @@ $gBitUser->verifyTicket();
 
 // Load up the Topic's board - we'll respect its permissions
 $board = new BitBoard( $gContent->mInfo['board_id'] );
+$board->load();
 
 $rslt = false;
 
@@ -35,7 +36,7 @@ if( isset($_REQUEST['is_locked']) || isset($_REQUEST['is_sticky']) ){
 // Remove a topic
 }elseif( isset( $_REQUEST['remove'] ) ) {
 	// Check permissions to edit this topic if the root object is the board check its perms, otherwise check general comment admin perms
-	if( !(( $gContent->mInfo['root_id'] == $gContent->mInfo['board_id'] && $board->hasEditPermission() ) || $gBitUser->hasPermission('p_liberty_admin_comments')) ){
+	if( !(( $gContent->mInfo['root_id'] == $gContent->mInfo['board_content_id'] && $board->hasAdminPermission() ) || $gBitUser->hasPermission('p_liberty_admin_comments')) ){
 		$gBitSystem->fatalError( 'You do not have permission to delete this topic.' );
 	}