From 4056408d731b1f37e61a7ac52395418c50e545a1 Mon Sep 17 00:00:00 2001
From: Andrew O'Neil <andy@andyofniall.net>
Date: Thu, 13 Dec 2007 21:51:00 +0000
Subject: [PATCH] Merged revisions 46775 via svnmerge from
 svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-privacy

........
  r46775 | aoneil | 2007-12-14 09:40:30 +1300 (Fri, 14 Dec 2007) | 2 lines

  Fix loops when saving files
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@46782 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 filesystem/File.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/filesystem/File.php b/filesystem/File.php
index 0b8091d2d..e4a7c6c76 100755
--- a/filesystem/File.php
+++ b/filesystem/File.php
@@ -240,7 +240,7 @@ class File extends DataObject {
 			$i++;
 			$tmp = TEMP_FOLDER;
 			`echo "$i / $total" > $tmp/progress`;
-			$file->loadContent();
+			$file->write();
 		}
 	}
 
@@ -255,22 +255,18 @@ class File extends DataObject {
 
 				//echo("<pre>Content for $this->Filename:\n$content</pre>");
 				$this->Content = $content;
-				$this->write();
 				break;
 			case 'doc':
 				$content = `catdoc $filename`;
 				$this->Content = $content;
-				$this->write();
 				break;
 			case 'ppt':
 				$content = `catppt $filename`;
 				$this->Content = $content;
-				$this->write();
 				break;
 			case 'txt';
 				$content = file_get_contents($this->FileName);
 				$this->Content = $content;
-				$this->write();
 		}
 	}