Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -1220,7 +1220,15 @@ class feed_forums implements feedBlockInterface
|
||||
}
|
||||
|
||||
$attach_pids[ intval($r['pid']) ] = intval($r['pid']);
|
||||
$memberIds[ intval($r['lastposter']) ] = intval($r['lastposter']);
|
||||
|
||||
if( $config['sortby'] == 'start_date' )
|
||||
{
|
||||
$memberIds[ intval($r['topic_starter_id']) ] = intval($r['topic_starter_id']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$memberIds[ intval($r['lastposter']) ] = intval($r['lastposter']);
|
||||
}
|
||||
}
|
||||
|
||||
ksort($content);
|
||||
@@ -1362,7 +1370,14 @@ class feed_forums implements feedBlockInterface
|
||||
switch( $config['content'] )
|
||||
{
|
||||
case 'topics':
|
||||
$memberRecord = IPSMember::buildDisplayData( $memberData[ $_content['lastposter'] ] );
|
||||
if( $config['sortby'] == 'start_date' )
|
||||
{
|
||||
$memberRecord = IPSMember::buildDisplayData( $memberData[ $_content['topic_starter_id'] ] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$memberRecord = IPSMember::buildDisplayData( $memberData[ $_content['lastposter'] ] );
|
||||
}
|
||||
break;
|
||||
|
||||
case 'replies':
|
||||
@@ -1413,7 +1428,7 @@ class feed_forums implements feedBlockInterface
|
||||
// Parse
|
||||
//-----------------------------------------
|
||||
|
||||
$_return = $_classAttach->renderAttachments( $htmlToParse, $attach_pids );
|
||||
$_return = $_classAttach->renderAttachments( $htmlToParse, $attach_pids, 'topic', false );
|
||||
|
||||
//-----------------------------------------
|
||||
// Remerge...
|
||||
|
||||
@@ -126,6 +126,7 @@ class plugin_site_poll implements pluginBlockInterface
|
||||
* @access public
|
||||
* @param array Block data
|
||||
* @return string Block HTML to display or cache
|
||||
* @link http://community.invisionpower.com/resources/bugs.html/_/ip-content/article-comments-pagination-not-working-r38106
|
||||
*/
|
||||
public function executePlugin( $block )
|
||||
{
|
||||
@@ -161,6 +162,9 @@ class plugin_site_poll implements pluginBlockInterface
|
||||
return '';
|
||||
}
|
||||
|
||||
$_currentSt = $this->request['st'];
|
||||
$this->request['st'] = 0;
|
||||
|
||||
$this->lang->loadLanguageFile( array( 'public_boards', 'public_topic' ), 'forums' );
|
||||
$this->lang->loadLanguageFile( array( 'public_editors' ), 'core' );
|
||||
|
||||
@@ -198,6 +202,8 @@ class plugin_site_poll implements pluginBlockInterface
|
||||
$pluginConfig = $this->returnPluginInfo();
|
||||
$templateBit = $pluginConfig['templateBit'] . '_' . $block['block_id'];
|
||||
$pollOutput = $topic->_generatePollOutput();
|
||||
|
||||
$this->request['st'] = $_currentSt;
|
||||
|
||||
ob_start();
|
||||
$_return = $this->registry->output->getTemplate('ccs')->$templateBit( $block['block_name'], $pollOutput['html'], $tid );
|
||||
@@ -206,6 +212,8 @@ class plugin_site_poll implements pluginBlockInterface
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->request['st'] = $_currentSt;
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user