Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* @brief Table Builder for followed content
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @subpackage Gallery
|
||||
* @since 16 Apr 2014
|
||||
* @version SVN_VERSION_NUMBER
|
||||
@@ -43,6 +43,9 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
$this->include = array( 'follow_added', 'follow_app', 'follow_area', 'follow_rel_id', 'follow_notify_freq', 'follow_is_anon' );
|
||||
$this->classes[] = 'ipsDataList_zebra';
|
||||
|
||||
/* Allow to filter by digests only */
|
||||
$this->filters['digest'] = array( "follow_notify_freq IN('daily','weekly')" );
|
||||
|
||||
$return = parent::__construct( 'core_follow', \IPS\Http\Url::internal( 'app=core&module=system&controller=followed', 'front', 'followed_content' )->setQueryString( 'type', "{$currentType[0]}_{$currentType[1]}" ), array( 'follow_member_id=? AND follow_app=? AND follow_area=?', \IPS\Member::loggedIn()->member_id, $currentType[0], $currentType[1] ) );
|
||||
|
||||
if ( !$this->sortBy )
|
||||
@@ -55,7 +58,6 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
{
|
||||
$this->rowsTemplate = $className::manageFollowRows();
|
||||
$containerClass = $className::$containerNodeClass;
|
||||
$this->group = 'follow_id';
|
||||
|
||||
$this->joins = array(
|
||||
array( 'from' => $className::$databaseTable, 'where' => array( $className::$databaseTable . '.' . $className::$databasePrefix . $className::$databaseColumnId . '=core_follow.follow_rel_id AND core_follow.follow_app=?', $currentType[0] ) )
|
||||
@@ -81,7 +83,7 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
$joinContainer = $className::$containerNodeClass ? TRUE : FALSE;
|
||||
$joins = array();
|
||||
$extraWhere = $className::followWhere( $joinContainer, $joins );
|
||||
|
||||
|
||||
if ( $joinContainer )
|
||||
{
|
||||
$containerClass = $className::$containerNodeClass;
|
||||
@@ -99,9 +101,14 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
|
||||
if ( $extraWhere )
|
||||
{
|
||||
if( isset( $extraWhere['item'] ) )
|
||||
if( isset( $extraWhere['item'] ) or isset( $extraWhere['container'] ) )
|
||||
{
|
||||
$this->where = array_merge( array( $this->where ), $extraWhere['item'] );
|
||||
$this->where = array( $this->where );
|
||||
|
||||
if( isset( $extraWhere['item'] ) )
|
||||
{
|
||||
$this->where = array_merge( $this->where, $extraWhere['item'] );
|
||||
}
|
||||
|
||||
if( isset( $extraWhere['container'] ) )
|
||||
{
|
||||
@@ -113,7 +120,7 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
$this->where = array_merge( array( $this->where ), $extraWhere );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$this->joins = array_merge( $this->joins, $joins );
|
||||
}
|
||||
elseif( $className == "\IPS\Member" )
|
||||
@@ -342,6 +349,8 @@ class _Table extends \IPS\Helpers\Table\Db
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
\IPS\Session::i()->csrfCheck();
|
||||
|
||||
$where = array( array( 'follow_member_id=? AND follow_app=? AND follow_area=?', \IPS\Member::loggedIn()->member_id, $this->currentType[0], $this->currentType[1] ), \IPS\Db::i()->in( 'follow_rel_id', array_keys( \IPS\Request::i()->moderate ) ) );
|
||||
|
||||
|
||||
Reference in new issue
Block a user