Version 3.4.8
This commit is contained in:
1 parent
b45ea0dffb
commit
c603205a25
1398 files changed
+36675
-31023
No files matched your search
@@ -4,11 +4,11 @@
|
||||
*~TERABYTE_DOC_READY~
|
||||
* $Copyright: (c) 2001 - 2011 Invision Power Services, Inc.$
|
||||
* $License: http://www.invisionpower.com/company/standards.php#license$
|
||||
* $Author: mmecham $
|
||||
* $Author: stuarts $
|
||||
* @since 11th October 2010
|
||||
* $LastChangedDate: 2013-08-14 06:45:49 -0400 (Wed, 14 Aug 2013) $
|
||||
* @version v3.4.6
|
||||
* $Revision: 12334 $
|
||||
* $LastChangedDate: 2014-10-12 16:26:57 -0400 (Sun, 12 Oct 2014) $
|
||||
* @version v3.4.8
|
||||
* $Revision: 12538 $
|
||||
*
|
||||
* <b>Example Usage:</b>
|
||||
* @code
|
||||
@@ -641,7 +641,7 @@ abstract class classes_like_composite
|
||||
$expire = IPS_UNIX_TIME_NOW - $_limit;
|
||||
|
||||
/* Fetch data by relID */
|
||||
$data = $this->getDataByRelationshipId( $relId, false, (array) $notificationOpts['ignore_data'], $type );
|
||||
$data = $this->getDataByRelationshipId( $relId, false, (array) $notificationOpts['ignore_data'], $type, ipsRegistry::$settings['like_notifications_limit'] );
|
||||
|
||||
/* Remove ourselves from notifications... */
|
||||
if ( $this->memberData['member_id'] && isset($data[ $this->memberData['member_id'] ]) && $notificationOpts['includeOwner'] !== true )
|
||||
@@ -752,6 +752,9 @@ abstract class classes_like_composite
|
||||
$notifyLibrary->setNotificationTitle( $notificationOpts['email_subject'] ? $notificationOpts['email_subject'] : IPSText::getTextClass('email')->subject );
|
||||
$notifyLibrary->setNotificationText( $thisTextMessage );
|
||||
$notifyLibrary->setNotificationHtml( $thisHtmlMessage );
|
||||
|
||||
/* Make sure we save meta data - #897885 */
|
||||
$notifyLibrary->setMetaData( array( 'meta_area' => $row['like_area'], 'meta_id' => $row['like_rel_id'], 'meta_app' => $row['like_app'] ) );
|
||||
|
||||
if ( ! empty( $notificationOpts['email_only_subject'] ) && $notificationOpts['email_only_subject'] != IPSText::getTextClass('email')->subject )
|
||||
{
|
||||
@@ -1337,7 +1340,7 @@ abstract class classes_like_composite
|
||||
* @param array Type of follow (immediate, none, offline, daily, etc)
|
||||
* @return @e mixed Array of likes data OR null
|
||||
*/
|
||||
public function getDataByRelationshipId( $relId, $skipAnon=true, $ignoreData=array(), $followType=array() )
|
||||
public function getDataByRelationshipId( $relId, $skipAnon=true, $ignoreData=array(), $followType=array(), $limit = 500 )
|
||||
{
|
||||
/* Init */
|
||||
$mids = array();
|
||||
@@ -1368,7 +1371,7 @@ abstract class classes_like_composite
|
||||
'from' => 'core_like',
|
||||
'where' => implode( " AND ", $where ),
|
||||
'order' => 'like_added DESC',
|
||||
'limit' => array( 0, 500 ) ) );
|
||||
'limit' => array( 0, $limit ) ) );
|
||||
$o = $this->DB->execute();
|
||||
|
||||
while( $row = $this->DB->fetch( $o ) )
|
||||
|
||||
Reference in new issue
Block a user