fix on media uploader and list parser

src/app/Http/Controllers/Admin/Content/Controller.php

@@ -431,7 +431,7 @@ protected function validator(Request $request, array $data, $id = null)
 				}
 
 
-				if ( $field->type == 'gallery' ) {
+				if ( $field->type == 'gallery' && $request->file( $field->name ) ) {
 					$nbr = count( $request->file( $field->name ) ) - 1;
 					foreach(range(0, $nbr) as $index) {
 						$rules[ $field->name .  '.' . $index ] = join( '|', $tmp );
@@ -443,17 +443,6 @@ protected function validator(Request $request, array $data, $id = null)
 			}
 		}
 
-		$validator = Validator::make($data, $rules);
-
-//		if ( $validator->fails() ) {
-//			echo '<pre>'; print_r($validator->errors() );
-//			die;
-////			return redirect('post/create')
-////				->withErrors($validator)
-////				->withInput();
-//		}
-//
-//		die;
 		return Validator::make($data, $rules);
 	}
 }

src/app/Http/Controllers/Admin/Media/UploadController.php

@@ -83,8 +83,7 @@ public function upload( Request $request )
 			}
 
 			if ( $media->id ) {
-				return response()->json( [ 'status' => 'ok', 'media' => $this->_parseMedia([ $media ]) ]);
-				// 'id' => $media->id, 'link' => asset($media->url)
+				return response()->json( [ 'status' => 'ok', 'media' => [ $this->_parseMedia( $media->toArray() ) ] ]);
 			} else {
 				return response()->json( [ 'status' => 'ko' ], 400);
 			}

src/app/Http/Controllers/Admin/Settings/SettingsController.php

@@ -61,6 +61,11 @@ public function setLanguage( Request $request, $language )
 	{
 		$request->session()->put('currentLanguage', $language);
 		App::setLocale( $language );
-		return redirect()->back();
+
+		if ( strstr( url()->previous(), 'edit' ) ) {
+			return redirect('admin');
+		} else {
+			return redirect()->back();
+		}
 	}
 }

src/app/Library/ContentListParser.php

@@ -122,7 +122,9 @@ public function getList()
 						}
 						if ( count($this->_contentList) > 0 ) {
 							foreach ( $this->_contentList as $index => $content ) {
-								$this->_contentList[$index]->categories = $tmp[$content->id];
+								if ( isset($this->_contentList[$index]) && isset($tmp[$content->id]) ) {
+									$this->_contentList[$index]->categories = $tmp[$content->id];
+								}
 							}
 						}
 					}