[#2454] Manually adding changes that wouldn't patch cleanly to 2.0

weaverryan · weaverryan · commit 7bf51a81f283 · 2013-04-11T07:33:47.000-05:00
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -321,7 +321,7 @@ object, which is what's returned after a ``file`` field is submitted::
         $this->path = $this->getFile()->getClientOriginalName();
 
         // clean up the file property as you won't need it anymore
-        $this->setFile(null);
+        $this->file = null;
     }
 
 Using Lifecycle Callbacks
@@ -407,16 +407,14 @@ Next, refactor the ``Document`` class to take advantage of these callbacks::
             // the entity from being persisted to the database on error
             $this->getFile()->move($this->getUploadRootDir(), $this->path);
 
-
-
             // check if we have an old image
             if (isset($this->temp)) {
                 // delete the old image
                 unlink($this->getUploadRootDir().'/'.$this->temp);
                 // clear the temp image path
                 $this->temp = null;
             }
-            $this->setFile(null);
+            $this->file = null;
         }
 
         /**
