Version 4.7.0
This commit is contained in:
1 parent
517a5e1f70
commit
8ba7d43898
1933 files changed
+65613
-11332
No files matched your search
@@ -52,13 +52,17 @@ class _Invisioncommunity extends \IPS\convert\Software
|
||||
{
|
||||
static::$dbNeeded = TRUE;
|
||||
|
||||
$version = $this->db->select( 'app_version', 'core_applications', array( 'app_directory=?', 'core' ) )->first();
|
||||
|
||||
/* We're matching against the human version since the long version can change with patches */
|
||||
if( $version == \IPS\Application::load( 'core')->version )
|
||||
try
|
||||
{
|
||||
static::$versionMatch = TRUE;
|
||||
$version = $this->db->select( 'app_version', 'core_applications', array( 'app_directory=?', 'core' ) )->first();
|
||||
|
||||
/* We're matching against the human version since the long version can change with patches */
|
||||
if ( $version == \IPS\Application::load( 'core' )->version )
|
||||
{
|
||||
static::$versionMatch = TRUE;
|
||||
}
|
||||
}
|
||||
catch( \IPS\Db\Exception $e ) {}
|
||||
}
|
||||
|
||||
return $return;
|
||||
@@ -365,6 +369,7 @@ class _Invisioncommunity extends \IPS\convert\Software
|
||||
|
||||
/* Attachments */
|
||||
\IPS\Task::queue( 'core', 'RebuildAttachmentThumbnails', array( 'app' => $this->app->app_id ), 4, array( 'app' ) );
|
||||
\IPS\Task::queue( 'convert', 'RebuildProfilePhotos', array( 'app' => $this->app->app_id ), 5, array( 'app' ) );
|
||||
|
||||
return array( "f_search_index_rebuild", "f_clear_caches" );
|
||||
}
|
||||
@@ -672,8 +677,8 @@ class _Invisioncommunity extends \IPS\convert\Software
|
||||
$row['ips_members_bitoptions2'] = $row['members_bitoptions2'];
|
||||
unset( $row['members_bitoptions'], $row['members_bitoptions2'] );
|
||||
|
||||
$path = $this->app->_session['more_info']['convertMembers']['upload_path'] . '/profile';
|
||||
$libraryClass->convertMember( $row, $profileFields, $profilePhotoName, $path, NULL, $coverPhotoName, $path );
|
||||
$path = $this->app->_session['more_info']['convertMembers']['upload_path'] . '/';
|
||||
$libraryClass->convertMember( $row, $profileFields, $profilePhotoName, $path . ( isset( $bits ) ? $bits[0] : '' ), NULL, $coverPhotoName, $path . ( isset( $coverBits[0] ) ? $coverBits[0] : '' ) );
|
||||
|
||||
/* Any friends need converting to followers? */
|
||||
foreach( $this->db->select( '*', 'core_follow', array( 'follow_app=? AND follow_area=? AND follow_rel_id=?', 'core', 'member', $row['member_id'] ) ) as $follow )
|
||||
@@ -1130,6 +1135,7 @@ class _Invisioncommunity extends \IPS\convert\Software
|
||||
|
||||
/* This applies to all options */
|
||||
$attachmentMap['id1_from_parent'] = FALSE;
|
||||
$attachmentMap['id3_skip_link'] = TRUE;
|
||||
|
||||
/* Remap rows */
|
||||
$name = explode( '/', $row['attach_location'] );
|
||||
|
||||
Reference in new issue
Block a user