Revision: 11525 http://wonder.svn.sourceforge.net/wonder/?rev=11525&view=rev Author: nullterminated Date: 2010-10-09 22:11:44 +0000 (Sat, 09 Oct 2010) Log Message: ----------- Prevent null pointer in link button if both value and string bindings are null. Modified Paths: -------------- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXLinkButton.java Modified: branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXLinkButton.java =================================================================== --- branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXLinkButton.java 2010-10-09 21:53:51 UTC (rev 11524) +++ branches/Wonder_5_0_0_WebObjects_5_4_Branch/Wonder/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXLinkButton.java 2010-10-09 22:11:44 UTC (rev 11525) @@ -582,7 +582,7 @@ if(submitInContext(context)) { value = valueVal == null?stringVal == null?"Submit":stringVal:valueVal; } else { - value = stringVal == null?valueVal:stringVal; + value = stringVal == null?valueVal == null?"Link":valueVal:stringVal; } return value.toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |