Version 5.0.13

system/Content/EditHistory.php

@@ -12,6 +12,7 @@ namespace IPS\Content;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
 
+use IPS\Content\Item;
 use IPS\IPS;
 use IPS\Settings;
 use IPS\Theme;
@@ -90,15 +91,23 @@ trait EditHistory
 		{
 			$logEdit = 'comment_log_edit';
 			$editReason = 'comment_edit_reason';
-			$column = 'comment_value';
+			$column = static::$formLangPrefix . 'comment_value';
+
+			/* If this is the first comment and the first comment is required, the content will be in a different array element */
+			/* @var Item $itemClass */
+			$itemClass = static::$itemClass;
+			if( $itemClass::$firstCommentRequired and $this->isFirst() )
+			{
+				$column = $itemClass::$formLangPrefix . 'content';
+			}
 		}
 		
 		$editIsPublic = Member::loggedIn()->group['g_append_edit'] ? $values[ $logEdit ] : TRUE;
 		$idField = static::$databaseColumnId;
 
-		if ( Settings::i()->edit_log == 2 and isset( $values[static::$formLangPrefix . $column] ) )
+		if ( Settings::i()->edit_log == 2 and isset( $values[ $column ] ) )
 		{
-			$content =  $values[static::$formLangPrefix . $column];
+			$content =  $values[ $column ];
 
 			Db::i()->insert( 'core_edit_history', array(
 				'class' => get_class( $this ),