D18240.diff
No OneTemporary
Actions

Size

980 B

Referenced Files

None

Subscribers

None

D18240.diff
View Options

	diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
	--- a/src/view/form/control/AphrontFormTokenizerControl.php
	+++ b/src/view/form/control/AphrontFormTokenizerControl.php
	@@ -33,6 +33,14 @@
	return $this;
	}

	+ private function getPlaceholder() {
	+ if (!strlen($this->placeholder)) {
	+ $datasource = $this->datasource;
	+ return $datasource->getPlaceholderText();
	+ }
	+ return $this->placeholder;
	+ }
	+
	public function setInitialValue(array $initial_value) {
	$this->initialValue = $initial_value;
	return $this;
	@@ -67,10 +75,7 @@
	}
	$datasource->setViewer($this->getUser());

	- $placeholder = null;
	- if (!strlen($this->placeholder)) {
	- $placeholder = $datasource->getPlaceholderText();
	- }
	+ $placeholder = $this->getPlaceholder();

	$values = nonempty($this->getValue(), array());
	$tokens = $datasource->renderTokens($values);