Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -3,19 +3,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Profile AJAX Ignored User methods
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: AndyMillne $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @subpackage Members
|
||||
* @link http://www.invisionpower.com
|
||||
* @since Thursday 26th June 2008
|
||||
* @version $Revision: 10914 $
|
||||
* @version $Revision: 11914 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -124,13 +124,13 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
/* Alright. Fetch the last 10 */
|
||||
//$this->messengerFunctions->addFolderFilter('myconvo');
|
||||
|
||||
$topics = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], 'myconvo', array( 'sort' => 'date', 'offsetStart' => 0, 'offsetEnd' => 10 ) );
|
||||
$topics = $this->messengerFunctions->getPersonalTopicsList( $this->memberData['member_id'], 'all', array( 'sort' => 'date', 'offsetStart' => 0, 'offsetEnd' => 10 ) );
|
||||
$topics = ( ! is_array( $topics ) ) ? array() : $topics;
|
||||
|
||||
/* reset */
|
||||
$this->messengerFunctions->resetMembersAlertCounts( $this->memberData );
|
||||
|
||||
$this->returnJsonArray( array( 'html' => $this->cleanOutput( $this->registry->output->getTemplate('global_other')->inboxList( $topics ) ) ) );
|
||||
$this->returnJsonArray( array( 'html' => $this->registry->output->getTemplate('global_other')->inboxList( $topics ) ), true );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -165,7 +165,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
/* Attempt to fetch the conversation */
|
||||
try
|
||||
{
|
||||
$conversationData = $this->messengerFunctions->fetchConversation( $topicID, $this->memberData['member_id'], array( 'offsetStart' => 0, 'offsetEnd' => 150 ) );
|
||||
$conversationData = $this->messengerFunctions->fetchConversation( $topicID, $this->memberData['member_id'], array( 'offsetStart' => 0, 'offsetEnd' => 300 ) );
|
||||
|
||||
$html = $this->registry->getClass('output')->getTemplate('messaging')->showConversationForArchive( $conversationData['topicData'], $conversationData['replyData'], $conversationData['memberData'] );
|
||||
|
||||
@@ -353,7 +353,7 @@ class public_members_ajax_messenger extends ipsAjaxCommand
|
||||
|
||||
$this->registry->getClass( 'class_localization')->loadLanguageFile( array( 'public_editors' ), 'core' );
|
||||
|
||||
return $this->returnJsonArray( array( 'success' => $this->registry->getClass('output')->getTemplate('messaging')->PMQuickForm( $toMemberData ) ) );
|
||||
return $this->returnHtml( $this->registry->getClass('output')->getTemplate('messaging')->PMQuickForm( $toMemberData ) );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user