@@ -488,11 +488,8 @@ class Merb::AbstractController ret = yield *args end - if captured.empty? - ret.to_s - else - captured - end + # return captured value only if it is not empty + captured.empty? ? ret.to_s : captured end # Calls the concatenate method for the selected template engine. lib/merb-core/controller/abstract_controller.rb 03ff7c4957115750d6802b9dee969be14a4b3057 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0f4957f2e03ba79eb914563507b0582738fb5d37 0f4957f2e03ba79eb914563507b0582738fb5d37 2008-09-27T23:05:35-07:00 2008-09-25T00:46:17-07:00 Use trenary operator here. Don't pay *too* much attention to this change. b996291521cd349603512f692b9c3d8e1b4e1442 Michael S. Klishin michael@novemberain.com