Version 3.4.8
This commit is contained in:
1 parent
b45ea0dffb
commit
c603205a25
1398 files changed
+36675
-31023
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.4.6
|
||||
* IP.Board v3.4.8
|
||||
* Moderator actions
|
||||
* Last Updated: $Date: 2013-09-04 23:48:12 -0400 (Wed, 04 Sep 2013) $
|
||||
* Last Updated: $Date: 2014-12-31 17:46:06 -0500 (Wed, 31 Dec 2014) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: rashbrook $
|
||||
@@ -13,7 +13,7 @@
|
||||
* @package IP.Board
|
||||
* @subpackage Forums
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Revision: 12345 $
|
||||
* @version $Revision: 12581 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -1089,6 +1089,11 @@ class app_forums_classes_topics
|
||||
{
|
||||
$post = array_merge( $group, $post );
|
||||
}
|
||||
|
||||
if ( !empty( $post['mgroup_others'] ) )
|
||||
{
|
||||
$post = ips_MemberRegistry::setUpSecondaryGroups( $post );
|
||||
}
|
||||
}
|
||||
|
||||
/* Post IP overrides member */
|
||||
@@ -1708,7 +1713,7 @@ class app_forums_classes_topics
|
||||
$member = $this->member->setUpSecondaryGroups( $member );
|
||||
}
|
||||
|
||||
$member = IPSMember::buildDisplayData( $member, array( 'signature' => 1, 'customFields' => 1, 'warn' => 1, 'checkFormat' => 1, 'cfLocation' => 'topic', 'photoTagSize' => array( 'thumb', 'small' ) ) );
|
||||
$member = IPSMember::buildDisplayData( $member, array( 'signature' => 1, 'customFields' => 1, 'warn' => 1, 'checkFormat' => 1, 'cfSkinGroup' => 'topic', 'cfLocation' => 'topic', 'photoTagSize' => array( 'thumb', 'small' ) ) );
|
||||
|
||||
//-----------------------------------------
|
||||
// Add it to the cached list
|
||||
@@ -2432,8 +2437,11 @@ class app_forums_classes_topics
|
||||
$sort_value = $date['post_date'];
|
||||
}
|
||||
}
|
||||
|
||||
$sort_order = ( $this->settings['post_order_sort'] == 'asc' ? '<' : '>' );
|
||||
|
||||
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$post['topic_id']} AND {$sort_field} <=" . intval( $sort_value ) . ' AND ' . $query ) );
|
||||
$this->DB->build( array( 'select' => 'COUNT(*) as posts', 'from' => 'posts', 'where' => "topic_id={$post['topic_id']} AND {$sort_field} {$sort_order}=" . intval( $sort_value ) . ' AND ' . $query ) );
|
||||
|
||||
$this->DB->execute();
|
||||
|
||||
$cposts = $this->DB->fetch();
|
||||
@@ -2450,10 +2458,11 @@ class app_forums_classes_topics
|
||||
|
||||
$st = ($pages - 1) * $this->settings['display_max_posts'];
|
||||
|
||||
/* @see Ticket 878869
|
||||
if( $this->settings['post_order_sort'] == 'desc' )
|
||||
{
|
||||
$st = (ceil(($cposts['posts']/$this->settings['display_max_posts'])) - $pages) * $this->settings['display_max_posts'];
|
||||
}
|
||||
}*/
|
||||
|
||||
return intval( $this->registry->getClass('topics')->stToPage( $st ) );
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user