mirror of
				https://github.com/strapi/strapi.git
				synced 2025-11-04 03:43:34 +00:00 
			
		
		
		
	Fix merge issue
This commit is contained in:
		
							parent
							
								
									35c3ea6eec
								
							
						
					
					
						commit
						03aa29e527
					
				@ -23,11 +23,14 @@ const parseFilesData = async (files) => {
 | 
			
		||||
      const getStream = () => fs.createReadStream(file.path);
 | 
			
		||||
 | 
			
		||||
      // Add formated data for the upload provider
 | 
			
		||||
      formatedFilesData[inputName] = strapi.plugin('upload').service('upload').formatFileInfo({
 | 
			
		||||
        filename: file.name,
 | 
			
		||||
        type: file.type,
 | 
			
		||||
        size: file.size,
 | 
			
		||||
      });
 | 
			
		||||
      formatedFilesData[inputName] = await strapi
 | 
			
		||||
        .plugin('upload')
 | 
			
		||||
        .service('upload')
 | 
			
		||||
        .formatFileInfo({
 | 
			
		||||
          filename: file.name,
 | 
			
		||||
          type: file.type,
 | 
			
		||||
          size: file.size,
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
      // Add image dimensions
 | 
			
		||||
      Object.assign(
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user