Version 4.5.0

applications/gallery/sources/Image/Comment.php

@@ -12,7 +12,7 @@
 namespace IPS\gallery\Image;
 
 /* 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;
@@ -92,9 +92,8 @@ class _Comment extends \IPS\Content\Comment implements \IPS\Content\EditHistory,
 	public static $hideLogKey = 'gallery-images';
 	
 	/**
-	 * Get items with permisison check
+	 * Get items with permission check
 	 *
-	 * @note	We override in order to provide checking against album restrictions
 	 * @param	array		$where				Where clause
 	 * @param	string		$order				MySQL ORDER BY clause (NULL to order by date)
 	 * @param	int|array	$limit				Limit clause
@@ -105,7 +104,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 )
 	{