Version 4.2.0
This commit is contained in:
1 parent
0dc2aee5ed
commit
96997ddd8e
2074 files changed
+125454
-55780
No files matched your search
@@ -1,12 +1,11 @@
|
||||
<?php
|
||||
/**
|
||||
* @brief Personal Conversation Message Model
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Community Suite
|
||||
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) Invision Power Services, Inc.
|
||||
* @license https://www.invisioncommunity.com/legal/standards/
|
||||
* @package Invision Community
|
||||
* @since 8 Jul 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
|
||||
namespace IPS\core\Messenger;
|
||||
@@ -146,7 +145,7 @@ class _Message extends \IPS\Content\Comment implements \IPS\Content\ReportCenter
|
||||
\IPS\Db::i()->update( 'core_message_topic_user_map', array( 'map_has_unread' => 0, 'map_last_topic_reply' => time(), 'map_read_time' => time() ), array( 'map_topic_id=? AND map_user_id=?', $this->item()->id, $this->author()->member_id ) );
|
||||
|
||||
$notification = new \IPS\Notification( \IPS\Application::load('core'), 'new_private_message', $this->item(), array( $this ) );
|
||||
$messengerModule = \IPS\Application\Module::get( 'core', 'messaging' );
|
||||
$messengerModule = \IPS\Application\Module::get( 'core', 'messaging', 'front' );
|
||||
|
||||
foreach ( $this->item()->maps() as $map )
|
||||
{
|
||||
@@ -177,10 +176,11 @@ class _Message extends \IPS\Content\Comment implements \IPS\Content\ReportCenter
|
||||
/**
|
||||
* Move Comment to another item
|
||||
*
|
||||
* @param \IPS\Content\Item $item The item to move this comment too.
|
||||
* @param \IPS\Content\Item $item The item to move this comment to
|
||||
* @param bool $skip Skip rebuilding new/old content item data (used for multimod where we can do it in one go after)
|
||||
* @return void
|
||||
*/
|
||||
public function move( \IPS\Content\Item $item )
|
||||
public function move( \IPS\Content\Item $item, $skip=FALSE )
|
||||
{
|
||||
/* Make sure all active participants in the old conversation are in the new one */
|
||||
$activeParticipants = array_keys( array_filter( $this->item()->maps( TRUE ), function ( $map ) {
|
||||
|
||||
Reference in new issue
Block a user