Commit7bf51a8

committed

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

1 parent803b3cf commit7bf51a8Copy full SHA for 7bf51a8

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -321,7 +321,7 @@ object, which is what's returned after a ``file`` field is submitted::
`321`	`321`	`$this->path = $this->getFile()->getClientOriginalName();`
`322`	`322`
`323`	`323`	`// clean up the file property as you won't need it anymore`
`324`		`- $this->setFile(null);`
	`324`	`+ $this->file =null;`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`Using Lifecycle Callbacks`
@@ -407,16 +407,14 @@ Next, refactor the ``Document`` class to take advantage of these callbacks::
`407`	`407`	`// the entity from being persisted to the database on error`
`408`	`408`	`$this->getFile()->move($this->getUploadRootDir(), $this->path);`
`409`	`409`
`410`		`-`
`411`		`-`
`412`	`410`	`// check if we have an old image`
`413`	`411`	`if (isset($this->temp)) {`
`414`	`412`	`// delete the old image`
`415`	`413`	`unlink($this->getUploadRootDir().'/'.$this->temp);`
`416`	`414`	`// clear the temp image path`
`417`	`415`	`$this->temp = null;`
`418`	`416`	`}`
`419`		`- $this->setFile(null);`
	`417`	`+ $this->file =null;`
`420`	`418`	`}`
`421`	`419`
`422`	`420`	`/**`

Comments

(0)