Version 4.5.0

system/Content/Reportable.php

@@ -11,7 +11,7 @@
 namespace IPS\Content;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -22,6 +22,11 @@ if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
  */
 trait Reportable
 {
+	/**
+	 * Cached report data for checking if item has already been reported
+	 */
+	public $reportData = null;
+	
 	/**
 	 * Something has been moderated
 	 *
@@ -34,23 +39,7 @@ trait Reportable
 		try
 		{
 			$idColumn = static::$databaseColumnId;
-			\IPS\core\Reports\Report::loadByClassAndId( get_class( $this ), $this->$idColumn )->lockAutoModeration();
-		}
-		catch( \Exception $e ) { }
-	}
-	
-	/**
-	 * Delete reports related to this content item/comment/review
-	 *
-	 * @return void
-	 */
-	public function deleteReport()
-	{
-		/* If something has been moderated, we should lock down the index to prevent it from being auto_moderated again */
-		try
-		{
-			$idColumn = static::$databaseColumnId;
-			\IPS\core\Reports\Report::loadByClassAndId( get_class( $this ), $this->$idColumn )->delete();
+			\IPS\core\Reports\Report::loadByClassAndId( \get_class( $this ), $this->$idColumn )->lockAutoModeration();
 		}
 		catch( \Exception $e ) { }
 	}