Version 4.3.6
This commit is contained in:
1 parent
fe1acf984a
commit
1a0c7fd3c2
609 files changed
+14707
-5726
No files matched your search
@@ -100,7 +100,15 @@ class _Digest
|
||||
if ( property_exists( $class, 'contentItemClass' ) )
|
||||
{
|
||||
$itemClass= $class::$contentItemClass;
|
||||
|
||||
|
||||
/* Force custom profile fields not to be returned, as they can reference templates */
|
||||
if( isset( $itemClass::$commentClass ) )
|
||||
{
|
||||
$commentClass = $itemClass::$commentClass;
|
||||
|
||||
$commentClass::$joinProfileFields = FALSE;
|
||||
}
|
||||
|
||||
foreach ( $itemClass::getItemsWithPermission( array(
|
||||
array( $itemClass::$databaseTable . '.' . $itemClass::$databasePrefix . $itemClass::$databaseColumnMap['container'] . '=? AND ' . $itemClass::$databaseTable . '.' . $itemClass::$databasePrefix . $itemClass::$databaseColumnMap['date'] . ' > ? AND ' . $itemClass::$databaseTable . '.' .$itemClass::$databasePrefix . $itemClass::$databaseColumnMap['author'] . '!=?', $follow['follow_rel_id'], $follow['follow_notify_sent'] ?: $follow['follow_added'], $follow['follow_member_id'] ) ),
|
||||
$itemClass::$databaseTable . '.' . $itemClass::$databasePrefix . $itemClass::$databaseColumnMap['date'] . ' ASC',
|
||||
@@ -140,6 +148,14 @@ class _Digest
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Force custom profile fields not to be returned, as they can reference templates */
|
||||
if( isset( $item::$commentClass ) )
|
||||
{
|
||||
$commentClass = $item::$commentClass;
|
||||
|
||||
$commentClass::$joinProfileFields = FALSE;
|
||||
}
|
||||
|
||||
foreach( $item->comments( 5, NULL, 'date', 'asc', NULL, FALSE, \IPS\DateTime::ts( $follow['follow_notify_sent'] ?: $follow['follow_added'] ), NULL, FALSE, FALSE, FALSE ) as $comment )
|
||||
{
|
||||
|
||||
|
||||
Reference in new issue
Block a user