Version 3.4.6
This commit is contained in:
1 parent
e4478369d8
commit
b45ea0dffb
1568 files changed
+155104
-161665
No files matched your search
@@ -7,7 +7,7 @@
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package Core
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 12266 $
|
||||
* @version $Rev: 12380 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -23,7 +23,7 @@ class classes_comments_bootstrap
|
||||
|
||||
/**
|
||||
* Construct
|
||||
*
|
||||
*
|
||||
* @param string Comment class key (app-section)
|
||||
* @param mixed Optional extra data to pass to init() method
|
||||
*/
|
||||
@@ -80,7 +80,7 @@ abstract class classes_comments_renderer
|
||||
protected $memberData;
|
||||
protected $cache;
|
||||
protected $caches;
|
||||
/**#@-*/
|
||||
/**#@-*/
|
||||
|
||||
protected $_cache = array();
|
||||
/**
|
||||
@@ -362,6 +362,7 @@ abstract class classes_comments_renderer
|
||||
$data['thisApp'] = $app;
|
||||
$data['repType'] = $_remap['comment_id'];
|
||||
$data['enableRep'] = $this->reputationEnabled();
|
||||
$data['baseUrl'] = "app=core&module=global&section=comments&parentId={$parent['parent_id']}&fromApp={$data['fromApp']}";
|
||||
|
||||
/* Give plugin a chance to adjust */
|
||||
$adjusted = $this->preOutputAdjustment( 'commentSingle', array( 'comment' => $comment, 'data' => $data, 'parent' => $parent ) );
|
||||
@@ -527,7 +528,7 @@ abstract class classes_comments_renderer
|
||||
/* Ignored users */
|
||||
foreach( $this->member->ignored_users as $_i )
|
||||
{
|
||||
if( $_i['ignore_topics'] AND $_i['ignore_ignore_id'] == $row['author_id'] )
|
||||
if( $_i['ignore_topics'] AND $_i['ignore_ignore_id'] == $row['comment_author_id'] )
|
||||
{
|
||||
if ( ! strstr( $this->settings['cannot_ignore_groups'], ','.$row['member_group_id'].',' ) )
|
||||
{
|
||||
@@ -543,6 +544,15 @@ abstract class classes_comments_renderer
|
||||
$row['pp_reputation_points'] = $row['pp_reputation_points'] ? $row['pp_reputation_points'] : 0;
|
||||
$row['has_given_rep'] = $row['has_given_rep'] ? $row['has_given_rep'] : 0;
|
||||
$row['rep_points'] = $this->registry->repCache->getRepPoints( array( 'app' => $app, 'type' => $_remap['comment_id'], 'type_id' => $row['comment_id'], 'rep_points' => $row['rep_points'] ) );
|
||||
|
||||
if ( ! ( $this->settings['reputation_protected_groups'] && in_array( $this->memberData['member_group_id'], explode( ',', $this->settings['reputation_protected_groups'] ) ) ) && $this->memberData['_members_cache']['rep_filter'] !== '*' )
|
||||
{
|
||||
if ( $this->settings['reputation_show_content'] && $row['rep_points'] < $this->memberData['_members_cache']['rep_filter'] && $this->settings['reputation_point_types'] != 'like' )
|
||||
{
|
||||
$row['_repignored'] = true;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* View */
|
||||
@@ -761,7 +771,7 @@ abstract class classes_comments_renderer
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Unhide a comment
|
||||
@@ -913,7 +923,7 @@ abstract class classes_comments_renderer
|
||||
* @return nowt lad
|
||||
*/
|
||||
public function sendNotifications( array $array, $comment )
|
||||
{
|
||||
{
|
||||
list( $_app, $_area ) = explode( '-', $this->whoAmI() );
|
||||
|
||||
/* Send them if they are approved */
|
||||
@@ -1109,7 +1119,7 @@ abstract class classes_comments_renderer
|
||||
/* Delete */
|
||||
$this->DB->delete( $this->table(), $_remap['comment_id'] . ' IN (' . implode( ",", $cids ) . ')' );
|
||||
|
||||
/* We also need to delete rep - Bug #37686 */
|
||||
/* We also need to delete rep - Bug #37686 */
|
||||
list( $app, $_where ) = explode( '-', $this->whoAmI() );
|
||||
|
||||
foreach( $cids as $cid )
|
||||
@@ -1203,7 +1213,7 @@ abstract class classes_comments_renderer
|
||||
|
||||
/* If we have anything.. */
|
||||
if ( count( $cids ) )
|
||||
{
|
||||
{
|
||||
/* Update array */
|
||||
$array = array( 'comment_approved' => ( $toggle == 'on' ? 1 : 0 ) );
|
||||
|
||||
@@ -1453,7 +1463,7 @@ abstract class classes_comments_renderer
|
||||
$pages = ceil( $number);
|
||||
}
|
||||
|
||||
$st = ($pages - 1) * $this->perPage();
|
||||
$st = ($pages - 1) * $this->perPage();
|
||||
|
||||
if( $showApprovalMessage )
|
||||
{
|
||||
@@ -1697,7 +1707,7 @@ abstract class classes_comments_renderer
|
||||
public function can( $type, array $array )
|
||||
{
|
||||
/* Default, so return least permissive */
|
||||
return 'NO_PERMISSION';
|
||||
return 'NO_PERMISSION';
|
||||
}
|
||||
/**
|
||||
* Unpack the repuation cache, yo.
|
||||
|
||||
Reference in new issue
Block a user