Version 4.7.6

This commit is contained in:
Neo committed 2025-12-19 16:05:19 -08:00
1 parent 8ba7d43898
commit 7b7404e741
1085 files changed
+30590 -7837

No files matched your search

+4 -14
View File
@@ -3448,20 +3448,10 @@ class _Core extends \IPS\convert\Library
/* No Longer Used */
$info['pp_customization'] = NULL;
if ( isset( $info['timezone'] ) )
if ( isset( $info['timezone'] ) AND $info['timezone'] instanceof \DateTimeZone )
{
if ( $info['timezone'] instanceof \DateTimeZone )
{
$info['timezone'] = $info['timezone']->getName();
}
else
{
if ( ( $info['timezone'] = @timezone_name_from_abbr( NULL, $info['timezone'] ) ) === FALSE )
{
$info['timezone'] = 'UTC';
}
}
$info['timezone'] = $info['timezone']->getName();
}
else
{
@@ -6172,7 +6162,7 @@ class _Core extends \IPS\convert\Library
* @param mixed $contentType Content Link Type
* @return boolean TRUE on success, or FALSE on failure.
*/
public function convertRssImported( $info=array(), $type='core_rss_import', $contentType )
public function convertRssImported( $info=array(), $type='core_rss_import', $contentType='' )
{
/* Godspeed */
if ( isset( $info['rss_imported_import_id'] ) )
@@ -693,11 +693,6 @@ class _Forums extends Core
$info['ipseo_priority'] = -1;
}
if ( !isset( $info['viglink'] ) )
{
$info['viglink'] = 1;
}
if ( isset( $info['qa_rate_questions'] ) )
{
if ( $info['qa_rate_questions'] != '*' )
@@ -672,6 +672,16 @@ class _Invisioncommunity extends \IPS\convert\Software
$profileFields = array();
}
/* Load TZ into an object and validate */
try
{
$row['timezone'] = new \DateTimeZone( $row['timezone'] );
}
catch( \Exception $e )
{
unset( $row['timezone'] );
}
/* Rename bit options so we can pass them through the conversion method */
$row['ips_members_bitoptions'] = $row['members_bitoptions'];
$row['ips_members_bitoptions2'] = $row['members_bitoptions2'];
@@ -631,7 +631,16 @@ class _Xenforo extends \IPS\convert\Software
foreach( $it AS $row )
{
$conversation = $this->db->select( 'conversation_id', 'xf_conversation_message', array( "message_id=?", $row['content_id'] ) )->first();
try
{
$conversation = $this->db->select( 'conversation_id', 'xf_conversation_message', array( "message_id=?", $row['content_id'] ) )->first();
}
catch( \UnderflowException $e )
{
$this->app->log( 'xf_attach_missing_conversation_link', __METHOD__, \IPS\convert\App::LOG_WARNING, $row['attachment_id'] );
$libraryClass->setLastKeyValue( $row['attachment_id'] );
continue;
}
$map = array(
'id1' => $conversation,
@@ -704,14 +704,22 @@ class _Xenforo extends \IPS\convert\Software
public function convertAttachments()
{
$libraryClass = $this->getLibrary();
$libraryClass::setKey( 'xf_attachment.attachment_id' );
$it = $this->fetch( 'xf_attachment', 'xf_attachment.attachment_id', array( "content_type=?", 'post' ) )->join( 'xf_attachment_data', 'xf_attachment.data_id = xf_attachment_data.data_id' );
foreach( $it AS $row )
{
$topic = $this->db->select( 'thread_id', 'xf_post', array( "post_id=?", $row['content_id'] ) )->first();
try
{
$topic = $this->db->select( 'thread_id', 'xf_post', array( "post_id=?", $row['content_id'] ) )->first();
}
catch( \UnderflowException $e )
{
$this->app->log( 'xf_attach_missing_topic_link', __METHOD__, \IPS\convert\App::LOG_WARNING, $row['attachment_id'] );
$libraryClass->setLastKeyValue( $row['attachment_id'] );
continue;
}
$map = array(
'id1' => $topic,