Version 4.3.0

applications/convert/sources/Library/Blog.php

@@ -36,7 +36,6 @@ class _Blog extends Core
 	public function menuRows()
 	{
 		$return		= array();
-		$classname	= get_class( $this->software );
 
 		foreach( $this->getConvertableItems() as $k => $v )
 		{
@@ -110,7 +109,8 @@ class _Blog extends Core
 						'source_rows'		=> $this->software->countRows( $v['table'], $v['where'] ),
 						'per_cycle'			=> 1000,
 						'dependencies'		=> array( 'convertClubBlogs' ),
-						'link_type'			=> 'core_club_blogs_entries'
+						'link_type'			=> 'core_club_blogs_entries',
+						'requires_rebuild'	=> TRUE
 					);
 				break;
 
@@ -122,7 +122,8 @@ class _Blog extends Core
 						'source_rows'		=> $this->software->countRows( $v['table'], $v['where'] ),
 						'per_cycle'			=> 1000,
 						'dependencies'		=> array( 'convertClubBlogEntries' ),
-						'link_type'			=> 'core_club_blogs_comments'
+						'link_type'			=> 'core_club_blogs_comments',
+						'requires_rebuild'	=> TRUE
 					);
 					break;
 				
@@ -140,6 +141,8 @@ class _Blog extends Core
 			}
 		}
 
+		$return = $this->software->extraMenuRows( $return );
+
 		return $return;
 	}
 	
@@ -181,7 +184,7 @@ class _Blog extends Core
 				
 				case 'convertAttachments':
 					$return['convertAttachments']			= array(
-						'core_attachments'		=> \IPS\Db::i()->in( \IPS\Db::i()->select( 'attachment_id', 'core_attachments_map', array( "location_key=?", 'blog_Entries' ) ) ),
+						'core_attachments'		=> \IPS\Db::i()->in( 'attach_id', (string) \IPS\Db::i()->select( 'attachment_id', 'core_attachments_map', array( "location_key=?", 'blog_Entries' ) ) ),
 						'core_attachments_map'	=> array( "location_key=?", 'blog_Entries' )
 					);
 					break;
@@ -985,7 +988,7 @@ class _Blog extends Core
 	 * @param	string|NULL			$filedata	If $filepath is NULL, this should contain the raw contents of the attachment
 	 * @return	integer|boolean		The ID of the inserted attachment, or FALSE on failure.
 	 */
-	public function convertAttachment( $info=array(), $map=array(), $filepath = NULL, $filedata = NULL ) 
+	public function convertAttachment( $info=array(), $map=array(), $filepath = NULL, $filedata = NULL, $thumbnailpath = NULL ) 
 	{
 		$map['id1_type']		= 'blog_entries';
 		$map['id1_from_parent']	= FALSE;
@@ -1000,7 +1003,7 @@ class _Blog extends Core
 			$map['id2_from_parent']	= FALSE;
 		}
 		
-		return parent::convertAttachment( $info, $map, $filepath, $filedata );
+		return parent::convertAttachment( $info, $map, $filepath, $filedata, $thumbnailpath );
 	}
 
 	/**