From: <gem...@li...> - 2012-02-13 15:44:17
|
Revision: 469 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=469&view=rev Author: michieltcs Date: 2012-02-13 15:44:10 +0000 (Mon, 13 Feb 2012) Log Message: ----------- Merge r467 from 1.5.0-pulse Revision Links: -------------- http://gemstracker.svn.sourceforge.net/gemstracker/?rev=467&view=rev Modified Paths: -------------- branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php Property Changed: ---------------- branches/1.5.x/ branches/1.5.x/library/ branches/1.5.x/new_project/htdocs/gems/ Property changes on: branches/1.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.5.0-pulse:306-430 /tags/1.5.0beta1:305 + /branches/1.5.0-pulse:306-430,467 /tags/1.5.0beta1:305 Property changes on: branches/1.5.x/library ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.5.0-pulse/library:306-344,346 /branches/newUser:113-150 /branches/newUser2:175-207 /branches/userloader:259-324 /tags/1.5.0beta1/library:305 + /branches/1.5.0-pulse/library:306-344,346,467 /branches/newUser:113-150 /branches/newUser2:175-207 /branches/userloader:259-324 /tags/1.5.0beta1/library:305 Modified: branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php =================================================================== --- branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php 2012-02-13 15:02:18 UTC (rev 468) +++ branches/1.5.x/library/classes/Gems/Email/EmailFormAbstract.php 2012-02-13 15:44:10 UTC (rev 469) @@ -54,7 +54,7 @@ */ protected $escort; - protected $messages; + protected $messages = array(); protected $model; Property changes on: branches/1.5.x/new_project/htdocs/gems ___________________________________________________________________ Modified: svn:mergeinfo - /branches/1.5.0-pulse/new_project/htdocs/gems:306-430 /tags/1.5.0beta1/new_project/htdocs/gems:305 /trunk/new_project/htdocs/gems:461 + /branches/1.5.0-pulse/new_project/htdocs/gems:306-430,467 /tags/1.5.0beta1/new_project/htdocs/gems:305 /trunk/new_project/htdocs/gems:461 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |