Version 4.3.6

applications/core/sources/Warnings/Warning.php

@@ -360,14 +360,6 @@ class _Warning extends \IPS\Content\Item
 			\IPS\Output::i()->error( 'no_module_permission', '2C150/3', 403, '' );
 		}
 		
-		foreach( $values['warn_punishment'] AS $p )
-		{
-			if ( $values['warn_' . $p ] === NULL )
-			{
-				\IPS\Output::i()->error( 'no_warning_action_time', '1C150/2', 403, '' );
-			}
-		}
-		
 		/* Work out points and expiry date */
 		$this->expire_date = NULL;
 		$this->points = $values['warn_points'];
@@ -470,6 +462,15 @@ class _Warning extends \IPS\Content\Item
 				}
 			}
 		}
+
+		/* We do this after the action is checked because the moderator may not be able to override the action, in which case the actual values won't have been submitted */
+		foreach( $values['warn_punishment'] AS $p )
+		{
+			if ( $values['warn_' . $p ] === NULL )
+			{
+				\IPS\Output::i()->error( 'no_warning_action_time', '1C150/2', 403, '' );
+			}
+		}
 		
 		/* Set notes */
 		$this->note_member = $values['warn_member_note'];