Changed the methods in order to getAbsolutePath returns the full path (because it's needed when unlink()

tristanbes · tristanbes · commit 8bef86b2b934 · 2011-07-20T06:05:18.000-07:00
diff --git a/cookbook/doctrine/file_uploads.rst b/cookbook/doctrine/file_uploads.rst
@@ -48,18 +48,23 @@ First, create a simple Doctrine Entity class to work with::
          */
         public $path;
 
-        public function getFullPath()
+        public function getAbsolutePath()
+        {
+            return null === $this->path ? null : $this->getUploadRootDir().'/'.$this->path;
+        }
+
+        public function getWebPath()
         {
-            return null === $this->path ? null : $this->getWebLocation().'/'.$this->path;
+            return null === $this->path ? null : $this->getWebPath().'/'.$this->path;
         }
 
         protected function getUploadRootDir()
         {
             // the absolute directory path where uploaded documents should be saved
-            return __DIR__.'/../../../../web/'.$this->getWebLocation();
+            return __DIR__.'/../../../../web/'.$this->getUploadDir();
         }
 
-        protected function getWebLocation()
+        protected function getUploadDir()
         {
             // get rid of the __DIR__ so it doesn't screw when displaying uploaded doc/image in the view.
             return 'uploads/documents';

Original file line number	Diff line number	Diff line change
`@@ -48,18 +48,23 @@ First, create a simple Doctrine Entity class to work with::`
`48`	`48`	`*/`
`49`	`49`	`public $path;`
`50`	`50`
`51`		`- public function getFullPath()`
	`51`	`+ public function getAbsolutePath()`
	`52`	`+ {`
	`53`	`+ return null === $this->path ? null : $this->getUploadRootDir().'/'.$this->path;`
	`54`	`+ }`
	`55`	`+`
	`56`	`+ public function getWebPath()`
`52`	`57`	`{`
`53`		`- return null === $this->path ? null : $this->getWebLocation().'/'.$this->path;`
	`58`	`+ return null === $this->path ? null : $this->getWebPath().'/'.$this->path;`
`54`	`59`	`}`
`55`	`60`
`56`	`61`	`protected function getUploadRootDir()`
`57`	`62`	`{`
`58`	`63`	`// the absolute directory path where uploaded documents should be saved`
`59`		`- return __DIR__.'/../../../../web/'.$this->getWebLocation();`
	`64`	`+ return __DIR__.'/../../../../web/'.$this->getUploadDir();`
`60`	`65`	`}`
`61`	`66`
`62`		`- protected function getWebLocation()`
	`67`	`+ protected function getUploadDir()`
`63`	`68`	`{`
`64`	`69`	`// get rid of the __DIR__ so it doesn't screw when displaying uploaded doc/image in the view.`
`65`	`70`	`return 'uploads/documents';`