diff --git a/src/applications/auth/application/PhabricatorAuthApplication.php b/src/applications/auth/application/PhabricatorAuthApplication.php --- a/src/applications/auth/application/PhabricatorAuthApplication.php +++ b/src/applications/auth/application/PhabricatorAuthApplication.php @@ -73,7 +73,7 @@ 'session/downgrade/' => 'PhabricatorAuthDowngradeSessionController', 'enroll/' => array( - '(?:(?P[^/]+)/)?(?:(?Psaved)/)?' + '(?:(?P[^/]+)/)?' => 'PhabricatorAuthNeedsMultiFactorController', ), 'sshkey/' => array( diff --git a/src/applications/settings/application/PhabricatorSettingsApplication.php b/src/applications/settings/application/PhabricatorSettingsApplication.php --- a/src/applications/settings/application/PhabricatorSettingsApplication.php +++ b/src/applications/settings/application/PhabricatorSettingsApplication.php @@ -23,7 +23,7 @@ } public function getRoutes() { - $panel_pattern = '(?:page/(?P[^/]+)/(?:(?Psaved)/)?)?'; + $panel_pattern = '(?:page/(?P[^/]+)/)?'; return array( '/settings/' => array( diff --git a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php --- a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php +++ b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php @@ -128,10 +128,6 @@ return PhabricatorPolicies::POLICY_ADMIN; } - public function getEffectiveObjectEditDoneURI($object) { - return parent::getEffectiveObjectViewURI($object).'saved/'; - } - public function getEffectiveObjectEditCancelURI($object) { if (!$object->getUser()) { return '/settings/'; diff --git a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php --- a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php @@ -138,7 +138,6 @@ $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Email Preferences')) - ->setFormSaved($request->getStr('saved')) ->setFormErrors($errors) ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->setForm($form); diff --git a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php --- a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php +++ b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php @@ -206,7 +206,6 @@ $algo_box = $this->newBox(pht('Password Algorithms'), $properties); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Change Password')) - ->setFormSaved($request->getStr('saved')) ->setFormErrors($errors) ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->setForm($form); diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php --- a/src/applications/transactions/editengine/PhabricatorEditEngine.php +++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php @@ -1259,11 +1259,6 @@ ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->appendChild($form); - // This is fairly questionable, but in use by Settings. - if ($request->getURIData('formSaved')) { - $box->setFormSaved(true); - } - $content = array( $box, $previews, diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php --- a/src/view/phui/PHUIObjectBoxView.php +++ b/src/view/phui/PHUIObjectBoxView.php @@ -7,7 +7,6 @@ private $background; private $tabGroups = array(); private $formErrors = null; - private $formSaved = false; private $infoView; private $form; private $validationException; @@ -75,19 +74,6 @@ return $this; } - public function setFormSaved($saved, $text = null) { - if (!$text) { - $text = pht('Changes saved.'); - } - if ($saved) { - $save = id(new PHUIInfoView()) - ->setSeverity(PHUIInfoView::SEVERITY_NOTICE) - ->appendChild($text); - $this->formSaved = $save; - } - return $this; - } - public function addTabGroup(PHUITabGroupView $view) { $this->tabGroups[] = $view; return $this; @@ -324,7 +310,6 @@ $header, $this->infoView, $this->formErrors, - $this->formSaved, $exception_errors, $this->form, $this->tabGroups,