Version 4.5.0

applications/cms/sources/Records/Comment.php

@@ -12,7 +12,7 @@
 namespace IPS\cms\Records;
 
 /* 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;
@@ -94,16 +94,39 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	 */
 	public static $customDatabaseId = NULL;
 	
-	/**
-	 * @brief	[Content]	Key for hide reasons
-	 */
-	public static $hideLogKey = 'ccs-records';
-	
 	/**
 	 * @brief Store generated search index titles for efficiency
 	 */
 	protected static $searchIndexTitles = array();
-	
+
+	/**
+	 * Load Record
+	 *
+	 * @see		\IPS\Db::build
+	 * @param	int|string	$id					ID
+	 * @param	string		$idField			The database column that the $id parameter pertains to (NULL will use static::$databaseColumnId)
+	 * @param	mixed		$extraWhereClause	Additional where clause(s) (see \IPS\Db::build for details) - if used will cause multiton store to be skipped and a query always ran
+	 * @return	static
+	 * @throws	\InvalidArgumentException
+	 * @throws	\OutOfRangeException
+	 */
+	public static function load( $id, $idField=NULL, $extraWhereClause=NULL )
+	{
+		if ( static::commentWhere() !== NULL )
+		{
+			if( $extraWhereClause === NULL )
+			{
+				$extraWhereClause = array( static::commentWhere() );
+			}
+			else
+			{
+				$extraWhereClause[] = static::commentWhere();
+			}
+		}
+
+		return parent::load( $id, $idField, $extraWhereClause );
+	}
+
 	/**
 	 * Post count for member
 	 *
@@ -139,7 +162,9 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	 * @param	bool		$joinContainer		If true, will join container data (set to TRUE if your $where clause depends on this data)
 	 * @param	bool		$joinComments		If true, will join comment data (set to TRUE if your $where clause depends on this data)
 	 * @param	bool		$joinReviews		If true, will join review data (set to TRUE if your $where clause depends on this data)
-	 * @return	\IPS\Patterns\ActiveRecordIterator|int
+	 * @param	bool		$countOnly				If true will return the count
+	 * @param	array|null	$joins					Additional arbitrary joins for the query
+	 * @return	array|NULL|\IPS\Content\Comment		If $limit is 1, will return \IPS\Content\Comment or NULL for no results. For any other number, will return an array.
 	 */
 	public static function getItemsWithPermission( $where=array(), $order=NULL, $limit=10, $permissionKey='read', $includeHiddenItems=\IPS\Content\Hideable::FILTER_AUTOMATIC, $queryFlags=0, \IPS\Member $member=NULL, $joinContainer=FALSE, $joinComments=FALSE, $joinReviews=FALSE, $countOnly=FALSE, $joins=NULL )
 	{
@@ -229,7 +254,8 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	{
 		$template = static::$commentTemplate[1];
 		static::$commentTemplate[0][0] = $this->item()->database()->template_display;
-		return call_user_func_array( array( \IPS\cms\Theme::i(), 'getTemplate' ), static::$commentTemplate[0] )->$template( $this->item(), $this );
+
+		return \IPS\cms\Theme::i()->getTemplate( static::$commentTemplate[0][0], static::$commentTemplate[0][1], static::$commentTemplate[0][2] )->$template( $this->item(), $this );
 	}
 	
 	/**
@@ -262,7 +288,7 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 		$item = $this->item();
 		$idColumn = $item::$databaseColumnId;
 		$commentIdColumn = static::$databaseColumnId;
-		return array( $this->item()->$idColumn, $this->$commentIdColumn, static::$customDatabaseId ); 
+		return array( $this->item()->$idColumn, $this->$commentIdColumn, static::$customDatabaseId . '-comment' ); 
 	}
 
 	/**