D16919.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16919.id.diff
View Options

	diff --git a/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php b/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php
	--- a/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php
	+++ b/src/applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php
	@@ -43,7 +43,7 @@
	'the result for this step. After the result is recorded, the build '.
	'plan will resume.'),
	'options' => array(
	- '' => pht('Continue Build Normally'),
	+ 'continue' => pht('Continue Build Normally'),
	'wait' => pht('Wait For Message'),
	),
	);
	diff --git a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
	--- a/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
	+++ b/src/applications/harbormaster/step/HarbormasterBuildStepImplementation.php
	@@ -237,7 +237,8 @@
	return false;
	}

	- return (bool)$target->getDetail('builtin.wait-for-message');
	+ $wait = $target->getDetail('builtin.wait-for-message');
	+ return ($wait == 'wait');
	}

	protected function shouldAbort(