D18969.id45496.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18969.id45496.diff
View Options

	diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
	--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
	+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
	@@ -7,6 +7,7 @@
	private $navigation;
	private $queryKey;
	private $preface;
	+ private $activeQuery;

	public function setPreface($preface) {
	$this->preface = $preface;
	@@ -45,6 +46,14 @@
	return $this->searchEngine;
	}

	+ protected function getActiveQuery() {
	+ if (!$this->activeQuery) {
	+ throw new Exception(pht('There is no active query yet.'));
	+ }
	+
	+ return $this->activeQuery;
	+ }
	+
	protected function validateDelegatingController() {
	$parent = $this->getDelegatingController();

	@@ -158,6 +167,8 @@
	$engine->saveQuery($saved_query);
	}

	+ $this->activeQuery = $saved_query;
	+
	$nav->selectFilter(
	'query/'.$saved_query->getQueryKey(),
	'query/advanced');
	@@ -867,10 +878,8 @@

	$engine = $this->getSearchEngine();
	$engine_class = get_class($engine);
	- $query_key = $this->getQueryKey();
	- if (!$query_key) {
	- $query_key = $engine->getDefaultQueryKey();
	- }
	+
	+ $query_key = $this->getActiveQuery()->getQueryKey();

	$can_use = $engine->canUseInPanelContext();
	$is_installed = PhabricatorApplication::isClassInstalledForViewer(