Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -157,6 +157,7 @@ class _Vbulletin extends \IPS\convert\Software
|
||||
{
|
||||
/* Content Rebuilds */
|
||||
\IPS\Task::queue( 'convert', 'RebuildGalleryImages', array( 'app' => $this->app->app_id ), 2, array( 'app' ) );
|
||||
\IPS\Task::queue( 'convert', 'RebuildContent', array( 'app' => $this->app->app_id, 'link' => 'gallery_comments', 'class' => 'IPS\gallery\Image\Comment' ), 2, array( 'app', 'link', 'class' ) );
|
||||
\IPS\Task::queue( 'core', 'RebuildItemCounts', array( 'class' => 'IPS\gallery\Image' ), 3, array( 'class' ) );
|
||||
\IPS\Task::queue( 'core', 'RebuildContainerCounts', array( 'class' => 'IPS\gallery\Album', 'count' => 0 ), 4, array( 'class' ) );
|
||||
\IPS\Task::queue( 'core', 'RebuildContainerCounts', array( 'class' => 'IPS\gallery\Category', 'count' => 0 ), 5, array( 'class' ) );
|
||||
@@ -295,13 +296,24 @@ class _Vbulletin extends \IPS\convert\Software
|
||||
$filepath = rtrim( $this->app->_session['more_info']['convertGalleryImages']['file_location'], '/' ) . '/' . $filepath . '/' . $image['pictureid'] . '.picture';
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
$albumAndDate = $this->db->select( 'albumid, dateline', 'albumpicture', array( "pictureid=?", $image['pictureid'] ) )->first();
|
||||
}
|
||||
catch( \UnderflowException $e )
|
||||
{
|
||||
/* Orphaned */
|
||||
$libraryClass->setLastKeyValue( $image['pictureid'] );
|
||||
continue;
|
||||
}
|
||||
|
||||
$info = array(
|
||||
'image_id' => $image['pictureid'],
|
||||
'image_album_id' => $this->db->select( 'albumid', 'albumpicture', array( "pictureid=?", $image['pictureid'] ) )->first(),
|
||||
'image_album_id' => $albumAndDate['albumid'],
|
||||
'image_member_id' => $image['userid'],
|
||||
'image_caption' => $image['caption'],
|
||||
'image_file_name' => $image['caption'] . '.' . $image['extension'],
|
||||
'image_date' => $this->db->select( 'dateline', 'albumpicture', array( "pictureid=?", $image['pictureid'] ) )->first(),
|
||||
'image_date' => $albumAndDate['dateline'],
|
||||
);
|
||||
|
||||
$libraryClass->convertGalleryImage( $info, $filepath, $filedata );
|
||||
@@ -436,7 +448,7 @@ class _Vbulletin extends \IPS\convert\Software
|
||||
$data = $this->app->getLink( \IPS\Request::i()->albumid, 'gallery_albums' );
|
||||
$item = \IPS\gallery\Album::load( $data );
|
||||
|
||||
if( $item->canView() )
|
||||
if( $item->can( 'view' ) )
|
||||
{
|
||||
return $item->url();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user