note: Fix e-mail test when moving from version to app

This commit is contained in:
Alexander Nicolaysen Sørnes
2009-07-29 17:33:41 +02:00
parent 9b9d3378aa
commit bb050bc040

View File

@@ -121,17 +121,17 @@ class Note {
$this->iVersionId, $this->iNoteId)) $this->iVersionId, $this->iNoteId))
return false; return false;
$sVersionBefore = Version::lookup_name($oNote->iVersionId);
if(!$this->iAppId) if(!$this->iAppId)
{ {
$sVersionBefore = Version::lookup_name($oNote->iVersionId);
$sVersionAfter = Version::lookup_name($this->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId);
$sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n";
} else } else
{ {
$oApp = new application($this->iAppId); $oApp = new application($this->iAppId);
$sNewApp = $oApp->sName; $sNewApp = $oApp->sName;
$sWhatChanged .= "Moved from version $shVersionBefore to application $sNewApp"; $sVersionBefore = version::fullName($oNote->iVersionId);
$sWhatChanged .= "Moved from version $sVersionBefore to application $sNewApp.\n\n";
} }
} }
if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId) if (($this->iAppId || $this->iVersionId) && $this->iAppId!=$oNote->iAppId)