fix parse media url

KaleidoscopeSrl · Sep 13, 2018 · d5ed8fa · d5ed8fa
1 parent e1490c8
commit d5ed8fa
Showing 1 changed file with 43 additions and 39 deletions.
diff --git a/src/app/Http/Controllers/Admin/Controller.php b/src/app/Http/Controllers/Admin/Controller.php
@@ -33,47 +33,51 @@ public function __construct()
 
 	protected function _parseMedia($media, $fieldName = null)
 	{
-		$ext   = strtolower( substr( $media['url'],strlen($media['url'])-4 ) );
-		$thumb = substr( $media['url'], 0, strlen($media['url'])-4 ) . '-thumb' . $ext;
+		if ( $media ) {
+
+			$ext   = strtolower( substr( $media['url'],strlen($media['url'])-4 ) );
+			$thumb = substr( $media['url'], 0, strlen($media['url'])-4 ) . '-thumb' . $ext;
+
+			if ( $ext != '.jpg' && $ext != '.png' && $ext != '.gif' ) {
+				$thumb = null;
+			} else {
+				$thumb = url( $thumb );
+			}
+
+			$icon  = 'iconfile-' . str_replace('.', '', $ext);
+
+			if ( $media['updated_at'] instanceof Carbon ) {
+				$updatedAt = date('d/m/Y H:i', $media['updated_at']->timestamp);
+			} else {
+				$updatedAt = substr( Utility::convertHumanDateTimeToIso($media['updated_at']), 0 ,16 );
+			}
+
+			if ( isset($fieldName) && !is_numeric($fieldName) ) {
+				$tmp = array(
+					'field_id'   => $fieldName,
+					'id'         => $media['id'],
+					'url'        => url( $media['url'] ),
+					'thumb'      => $thumb,
+					'icon'       => $icon,
+					'filename'   => $media['filename'],
+					'size'       => Utility::formatBytes( Storage::size($media['url']) ),
+					'updated_at' => $updatedAt
+				);
+			} else {
+				$tmp = array(
+					'id'         => $media['id'],
+					'url'        => url( $media['url'] ),
+					'thumb'      => $thumb,
+					'icon'       => $icon,
+					'filename'   => $media['filename'],
+					'size'       => Utility::formatBytes( Storage::size($media['url']) ),
+					'updated_at' => $updatedAt
+				);
+			}
+
+			return $tmp;
 
-		if ( $ext != '.jpg' && $ext != '.png' && $ext != '.gif' ) {
-			$thumb = null;
-		} else {
-			$thumb = url( $thumb );
 		}
-
-		$icon  = 'iconfile-' . str_replace('.', '', $ext);
-
-		if ( $media['updated_at'] instanceof Carbon ) {
-			$updatedAt = date('d/m/Y H:i', $media['updated_at']->timestamp);
-		} else {
-			$updatedAt = substr( Utility::convertHumanDateTimeToIso($media['updated_at']), 0 ,16 );
-		}
-
-		if ( isset($fieldName) && !is_numeric($fieldName) ) {
-			$tmp = array(
-				'field_id'   => $fieldName,
-				'id'         => $media['id'],
-				'url'        => url( $media['url'] ),
-				'thumb'      => $thumb,
-				'icon'       => $icon,
-				'filename'   => $media['filename'],
-				'size'       => Utility::formatBytes( Storage::size($media['url']) ),
-				'updated_at' => $updatedAt
-			);
-		} else {
-			$tmp = array(
-				'id'         => $media['id'],
-				'url'        => url( $media['url'] ),
-				'thumb'      => $thumb,
-				'icon'       => $icon,
-				'filename'   => $media['filename'],
-				'size'       => Utility::formatBytes( Storage::size($media['url']) ),
-				'updated_at' => $updatedAt
-			);
-		}
-
-		return $tmp;
 	}
 
 	protected function guard()