Version 5.0.0 beta 5

system/Content/Statistics.php

@@ -397,16 +397,7 @@ trait Statistics
 			return array();
 		}
 
-		$return = array();
-		foreach( new ActiveRecordIterator( Db::i()->select( '*', $commentClass::$databaseTable, array( Db::i()->in( $commentIdField, $postIds ) ), "FIND_IN_SET( {$commentIdField}, '" . implode( ",", $postIds ) . "' )", array( 0, $count ) ), $commentClass ) as $comment )
-		{
-			if ( $comment->canView() and $comment->mapped('item') == $this->$idField and isset( $counts[ $comment->$commentIdField ] ) )
-			{
-				$return[] = array( 'comment' => $comment, 'count' => $counts[ $comment->$commentIdField ] );
-			}
-		}
-
-		return $return;
+		return $this->getComments( $commentClass, $commentIdField, $idField, $postIds, $count, $counts );
 	}
 
 	/**
@@ -469,18 +460,40 @@ trait Statistics
 			return array();
 		}
 
-		$return = array();
-		foreach( new ActiveRecordIterator( Db::i()->select( '*', $commentClass::$databaseTable, array( Db::i()->in( $commentIdField, $postIds ) ), "FIND_IN_SET( {$commentIdField}, '" . implode( ",", $postIds ) . "' )", array( 0, $count ) ), $commentClass ) as $comment )
+		return $this->getComments( $commentClass, $commentIdField, $idField, $postIds, $count, $counts );
+	}
+
+	protected $commentCache = array();
+
+	/**
+	 * Get the comments, storing them for later use in the same request
+	 *
+	 * @param string $commentClass
+	 * @param string $commentIdField
+	 * @param string $idField
+	 * @param array $postIds
+	 * @param int $count
+	 * @param array $counts
+	 * @return array
+	 */
+	protected function getComments( string $commentClass, string $commentIdField, string $idField, array $postIds, int $count, array $counts ): array
+	{
+		$key = md5( $commentClass . $commentIdField . $idField . implode( ',', $postIds ) . $count . json_encode( $counts ) );
+
+		if ( ! isset( $this->commentCache[ $key ] ) )
 		{
-			if ( $comment->canView() and $comment->mapped('item') == $this->$idField and isset( $counts[ $comment->$commentIdField ] ) )
+			$this->commentCache[ $key ] = [];
+			foreach ( new ActiveRecordIterator( Db::i()->select( '*', $commentClass::$databaseTable, [Db::i()->in( $commentIdField, $postIds )], "FIND_IN_SET( {$commentIdField}, '" . implode( ",", $postIds ) . "' )", [0, $count] ), $commentClass ) as $comment )
 			{
-				$return[] = array( 'comment' => $comment, 'count' => $counts[ $comment->$commentIdField ] );
+				if ( $comment->canView() and $comment->mapped( 'item' ) == $this->$idField and isset( $counts[$comment->$commentIdField] ) )
+				{
+					$this->commentCache[ $key ][] = ['comment' => $comment, 'count' => $counts[$comment->$commentIdField]];
+				}
 			}
 		}
 
-		return $return;
+		return $this->commentCache[ $key ];
 	}
-
 	/**
 	 * Fetch the top 10 popular days for posts
 	 *