From b5f0950c295a04f42c13e4f15b18c459914dc35d Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 15 Oct 2010 02:34:16 +0000
Subject: [PATCH] MINOR: add text/plain to the list of accepted mime types
 (from r105985)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@112484 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/ModelAdmin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index c5e98562..fafe12d0 100755
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -535,7 +535,11 @@ class ModelAdmin_CollectionController extends Controller {
 		$loader = new $importerClass($data['ClassName']);
 		
 		// File wasn't properly uploaded, show a reminder to the user
-		if(empty($_FILES['_CsvFile']['tmp_name']) || $_FILES['_CsvFile']['type'] != 'text/csv' || file_get_contents($_FILES['_CsvFile']['tmp_name']) == '') {
+		if(
+			empty($_FILES['_CsvFile']['tmp_name']) ||
+			array_search($_FILES['_CsvFile']['type'], array('text/csv', 'text/plain')) === false ||
+			file_get_contents($_FILES['_CsvFile']['tmp_name']) == ''
+		) {
 			$form->sessionMessage(_t('ModelAdmin.NOCSVFILE', 'Please browse for a CSV file to import'), 'good');
 			$this->redirectBack();
 			return false;