D15241.id36786.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15241.id36786.diff
View Options

	diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
	--- a/src/applications/project/application/PhabricatorProjectApplication.php
	+++ b/src/applications/project/application/PhabricatorProjectApplication.php
	@@ -65,8 +65,6 @@
	=> $this->getPanelRouting('PhabricatorProjectPanelController'),
	'subprojects/(?P<id>[1-9]\d*)/'
	=> 'PhabricatorProjectSubprojectsController',
	- 'milestones/(?P<id>[1-9]\d*)/'
	- => 'PhabricatorProjectMilestonesController',
	'board/(?P<id>[1-9]\d*)/'.
	'(?P<filter>filter/)?'.
	'(?:query/(?P<queryKey>[^/]+)/)?'
	diff --git a/src/applications/project/engine/PhabricatorProjectEditEngine.php b/src/applications/project/engine/PhabricatorProjectEditEngine.php
	--- a/src/applications/project/engine/PhabricatorProjectEditEngine.php
	+++ b/src/applications/project/engine/PhabricatorProjectEditEngine.php
	@@ -88,15 +88,11 @@

	protected function getObjectCreateCancelURI($object) {
	$parent = $this->getParentProject();
	- if ($parent) {
	- $id = $parent->getID();
	- return "/project/subprojects/{$id}/";
	- }
	-
	$milestone = $this->getMilestoneProject();
	- if ($milestone) {
	- $id = $milestone->getID();
	- return "/project/milestones/{$id}/";
	+
	+ if ($parent \|\| $milestone) {
	+ $id = nonempty($parent, $milestone)->getID();
	+ return "/project/subprojects/{$id}/";
	}

	return parent::getObjectCreateCancelURI($object);