Page MenuHomePhabricator
Files F15420535

D20154.id48161.diff
No OneTemporary
Actions

D20154.id48161.diff
View Options

diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
--- a/src/aphront/AphrontRequest.php
+++ b/src/aphront/AphrontRequest.php
@@ -594,7 +594,7 @@
$request_uri = idx($_SERVER, 'REQUEST_URI', '/');
$uri = new PhutilURI($request_uri);
- $uri->setQueryParam('__path__', null);
+ $uri->removeQueryParam('__path__');
$path = phutil_escape_uri($this->getPath());
$uri->setPath($path);
diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -137,7 +137,7 @@
$phid = $object->getPHID();
$add_uri = id(new PhutilURI($edit_base))
- ->setQueryParam('objectPHID', $object->getPHID());
+ ->replaceQueryParam('objectPHID', $object->getPHID());
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
diff --git a/src/applications/auth/controller/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php
--- a/src/applications/auth/controller/PhabricatorAuthController.php
+++ b/src/applications/auth/controller/PhabricatorAuthController.php
@@ -95,7 +95,7 @@
private function buildLoginValidateResponse(PhabricatorUser $user) {
$validate_uri = new PhutilURI($this->getApplicationURI('validate/'));
- $validate_uri->setQueryParam('expect', $user->getUsername());
+ $validate_uri->replaceQueryParam('expect', $user->getUsername());
return id(new AphrontRedirectResponse())->setURI((string)$validate_uri);
}
diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php
--- a/src/applications/auth/controller/PhabricatorAuthStartController.php
+++ b/src/applications/auth/controller/PhabricatorAuthStartController.php
@@ -54,7 +54,7 @@
}
$redirect_uri = $request->getRequestURI();
- $redirect_uri->setQueryParam('cleared', 1);
+ $redirect_uri->replaceQueryParam('cleared', 1);
return id(new AphrontRedirectResponse())->setURI($redirect_uri);
}
}
@@ -64,7 +64,7 @@
// the workflow will continue normally.
if ($did_clear) {
$redirect_uri = $request->getRequestURI();
- $redirect_uri->setQueryParam('cleared', null);
+ $redirect_uri->removeQueryParam('cleared');
return id(new AphrontRedirectResponse())->setURI($redirect_uri);
}
diff --git a/src/applications/auth/controller/config/PhabricatorAuthNewController.php b/src/applications/auth/controller/config/PhabricatorAuthNewController.php
--- a/src/applications/auth/controller/config/PhabricatorAuthNewController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthNewController.php
@@ -32,7 +32,7 @@
$provider_class = get_class($provider);
$provider_uri = id(new PhutilURI('/config/edit/'))
- ->setQueryParam('provider', $provider_class);
+ ->replaceQueryParam('provider', $provider_class);
$provider_uri = $this->getApplicationURI($provider_uri);
$already_exists = isset($configured_classes[get_class($provider)]);
diff --git a/src/applications/auth/controller/mfa/PhabricatorAuthFactorProviderEditController.php b/src/applications/auth/controller/mfa/PhabricatorAuthFactorProviderEditController.php
--- a/src/applications/auth/controller/mfa/PhabricatorAuthFactorProviderEditController.php
+++ b/src/applications/auth/controller/mfa/PhabricatorAuthFactorProviderEditController.php
@@ -45,7 +45,7 @@
foreach ($factors as $factor_key => $factor) {
$factor_uri = id(new PhutilURI('/mfa/edit/'))
- ->setQueryParam('providerFactorKey', $factor_key);
+ ->replaceQueryParam('providerFactorKey', $factor_key);
$factor_uri = $this->getApplicationURI($factor_uri);
$is_enabled = $factor->canCreateNewProvider();
diff --git a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
--- a/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
+++ b/src/applications/auth/extension/PhabricatorAuthMainMenuBarExtension.php
@@ -42,7 +42,7 @@
$uri = new PhutilURI('/auth/start/');
if ($controller) {
$path = $controller->getRequest()->getPath();
- $uri->setQueryParam('next', $path);
+ $uri->replaceQueryParam('next', $path);
}
return id(new PHUIButtonView())
diff --git a/src/applications/calendar/controller/PhabricatorCalendarImportViewController.php b/src/applications/calendar/controller/PhabricatorCalendarImportViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarImportViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarImportViewController.php
@@ -234,7 +234,7 @@
$all_uri = $this->getApplicationURI('import/log/');
$all_uri = (string)id(new PhutilURI($all_uri))
- ->setQueryParam('importSourcePHID', $import->getPHID());
+ ->replaceQueryParam('importSourcePHID', $import->getPHID());
$all_button = id(new PHUIButtonView())
->setTag('a')
@@ -273,8 +273,8 @@
$all_uri = $this->getApplicationURI();
$all_uri = (string)id(new PhutilURI($all_uri))
- ->setQueryParam('importSourcePHID', $import->getPHID())
- ->setQueryParam('display', 'list');
+ ->replaceQueryParam('importSourcePHID', $import->getPHID())
+ ->replaceQueryParam('display', 'list');
$all_button = id(new PHUIButtonView())
->setTag('a')
diff --git a/src/applications/config/check/PhabricatorWebServerSetupCheck.php b/src/applications/config/check/PhabricatorWebServerSetupCheck.php
--- a/src/applications/config/check/PhabricatorWebServerSetupCheck.php
+++ b/src/applications/config/check/PhabricatorWebServerSetupCheck.php
@@ -40,7 +40,7 @@
$base_uri = id(new PhutilURI($base_uri))
->setPath($send_path)
- ->setQueryParam($expect_key, $expect_value);
+ ->replaceQueryParam($expect_key, $expect_value);
$self_future = id(new HTTPSFuture($base_uri))
->addHeader('X-Phabricator-SelfCheck', 1)
diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php
--- a/src/applications/conpherence/controller/ConpherenceViewController.php
+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
@@ -188,7 +188,7 @@
} else {
// user not logged in so give them a login button.
$login_href = id(new PhutilURI('/auth/start/'))
- ->setQueryParam('next', '/'.$conpherence->getMonogram());
+ ->replaceQueryParam('next', '/'.$conpherence->getMonogram());
return id(new PHUIFormLayoutView())
->addClass('login-to-participate')
->appendInstructions(pht('Log in to join this room and participate.'))
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
@@ -287,7 +287,7 @@
$edit_uri = "/dashboard/panel/edit/{$panel_id}/";
$edit_uri = new PhutilURI($edit_uri);
if ($dashboard_id) {
- $edit_uri->setQueryParam('dashboardID', $dashboard_id);
+ $edit_uri->replaceQueryParam('dashboardID', $dashboard_id);
}
$action_edit = id(new PHUIIconView())
@@ -303,7 +303,7 @@
$remove_uri = "/dashboard/removepanel/{$dashboard_id}/";
$remove_uri = id(new PhutilURI($remove_uri))
- ->setQueryParam('panelPHID', $panel_phid);
+ ->replaceQueryParam('panelPHID', $panel_phid);
$action_remove = id(new PHUIIconView())
->setIcon('fa-trash-o')
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
--- a/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php
@@ -113,11 +113,11 @@
$dashboard_id = $this->dashboard->getID();
$create_uri = id(new PhutilURI('/dashboard/panel/create/'))
- ->setQueryParam('dashboardID', $dashboard_id)
- ->setQueryParam('column', $column);
+ ->replaceQueryParam('dashboardID', $dashboard_id)
+ ->replaceQueryParam('column', $column);
$add_uri = id(new PhutilURI('/dashboard/addpanel/'.$dashboard_id.'/'))
- ->setQueryParam('column', $column);
+ ->replaceQueryParam('column', $column);
$create_button = id(new PHUIButtonView())
->setTag('a')
diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
@@ -71,7 +71,7 @@
$uri = $this->getApplicationURI("diff/{$diff_id}/");
$uri = new PhutilURI($uri);
if ($revision) {
- $uri->setQueryParam('revisionID', $revision->getID());
+ $uri->replaceQueryParam('revisionID', $revision->getID());
}
return id(new AphrontRedirectResponse())->setURI($uri);
diff --git a/src/applications/fact/controller/PhabricatorFactHomeController.php b/src/applications/fact/controller/PhabricatorFactHomeController.php
--- a/src/applications/fact/controller/PhabricatorFactHomeController.php
+++ b/src/applications/fact/controller/PhabricatorFactHomeController.php
@@ -11,7 +11,7 @@
if ($request->isFormPost()) {
$uri = new PhutilURI('/fact/chart/');
- $uri->setQueryParam('y1', $request->getStr('y1'));
+ $uri->replaceQueryParam('y1', $request->getStr('y1'));
return id(new AphrontRedirectResponse())->setURI($uri);
}
diff --git a/src/applications/files/controller/PhabricatorFileLightboxController.php b/src/applications/files/controller/PhabricatorFileLightboxController.php
--- a/src/applications/files/controller/PhabricatorFileLightboxController.php
+++ b/src/applications/files/controller/PhabricatorFileLightboxController.php
@@ -70,7 +70,7 @@
if (!$viewer->isLoggedIn()) {
$login_href = id(new PhutilURI('/auth/start/'))
- ->setQueryParam('next', '/'.$file->getMonogram());
+ ->replaceQueryParam('next', '/'.$file->getMonogram());
return id(new PHUIFormLayoutView())
->addClass('phui-comment-panel-empty')
->appendChild(
diff --git a/src/applications/files/controller/PhabricatorFileTransformListController.php b/src/applications/files/controller/PhabricatorFileTransformListController.php
--- a/src/applications/files/controller/PhabricatorFileTransformListController.php
+++ b/src/applications/files/controller/PhabricatorFileTransformListController.php
@@ -61,7 +61,7 @@
$view_href = $file->getURIForTransform($xform);
$view_href = new PhutilURI($view_href);
- $view_href->setQueryParam('regenerate', 'true');
+ $view_href->replaceQueryParam('regenerate', 'true');
$view_text = pht('Regenerate');
diff --git a/src/applications/files/markup/PhabricatorImageRemarkupRule.php b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
--- a/src/applications/files/markup/PhabricatorImageRemarkupRule.php
+++ b/src/applications/files/markup/PhabricatorImageRemarkupRule.php
@@ -149,7 +149,7 @@
));
} else {
$src_uri = id(new PhutilURI('/file/imageproxy/'))
- ->setQueryParam('uri', $uri);
+ ->replaceQueryParam('uri', $uri);
$img = id(new PHUIRemarkupImageView())
->setURI($src_uri)
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -300,9 +300,9 @@
$subtask_form = head($subtask_options);
$form_key = $subtask_form->getIdentifier();
$subtask_uri = id(new PhutilURI("/task/edit/form/{$form_key}/"))
- ->setQueryParam('parent', $id)
- ->setQueryParam('template', $id)
- ->setQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
+ ->replaceQueryParam('parent', $id)
+ ->replaceQueryParam('template', $id)
+ ->replaceQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
$subtask_workflow = false;
}
diff --git a/src/applications/maniphest/controller/ManiphestTaskSubtaskController.php b/src/applications/maniphest/controller/ManiphestTaskSubtaskController.php
--- a/src/applications/maniphest/controller/ManiphestTaskSubtaskController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskSubtaskController.php
@@ -47,9 +47,9 @@
$subtype = $subtype_map->getSubtype($subtype_key);
$subtask_uri = id(new PhutilURI("/task/edit/form/{$form_key}/"))
- ->setQueryParam('parent', $id)
- ->setQueryParam('template', $id)
- ->setQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
+ ->replaceQueryParam('parent', $id)
+ ->replaceQueryParam('template', $id)
+ ->replaceQueryParam('status', ManiphestTaskStatus::getDefaultStatus());
$subtask_uri = $this->getApplicationURI($subtask_uri);
$item = id(new PHUIObjectItemView())
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -135,7 +135,7 @@
if ($this->showBatchControls) {
$href = new PhutilURI('/maniphest/task/edit/'.$task->getID().'/');
if (!$this->showSubpriorityControls) {
- $href->setQueryParam('ungrippable', 'true');
+ $href->replaceQueryParam('ungrippable', 'true');
}
$item->addAction(
id(new PHUIListItemView())
diff --git a/src/applications/multimeter/controller/MultimeterSampleController.php b/src/applications/multimeter/controller/MultimeterSampleController.php
--- a/src/applications/multimeter/controller/MultimeterSampleController.php
+++ b/src/applications/multimeter/controller/MultimeterSampleController.php
@@ -302,11 +302,11 @@
if (!strlen($group)) {
$group = null;
}
- $uri->setQueryParam('group', $group);
+ $uri->replaceQueryParam('group', $group);
if ($wipe) {
foreach ($this->getColumnMap() as $key => $column) {
- $uri->setQueryParam($key, null);
+ $uri->removeQueryParam($key);
}
}
@@ -317,7 +317,7 @@
$value = (array)$value;
$uri = clone $this->getRequest()->getRequestURI();
- $uri->setQueryParam($key, implode(',', $value));
+ $uri->replaceQueryParam($key, implode(',', $value));
return phutil_tag(
'a',
diff --git a/src/applications/notification/client/PhabricatorNotificationServerRef.php b/src/applications/notification/client/PhabricatorNotificationServerRef.php
--- a/src/applications/notification/client/PhabricatorNotificationServerRef.php
+++ b/src/applications/notification/client/PhabricatorNotificationServerRef.php
@@ -153,7 +153,7 @@
$instance = PhabricatorEnv::getEnvConfig('cluster.instance');
if (strlen($instance)) {
- $uri->setQueryParam('instance', $instance);
+ $uri->replaceQueryParam('instance', $instance);
}
return $uri;
diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
--- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
@@ -25,7 +25,7 @@
$notifications_view = $builder->buildView();
$content = $notifications_view->render();
- $clear_uri->setQueryParam(
+ $clear_uri->replaceQueryParam(
'chronoKey',
head($stories)->getChronologicalKey());
} else {
diff --git a/src/applications/notification/query/PhabricatorNotificationSearchEngine.php b/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
--- a/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
+++ b/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
@@ -111,7 +111,7 @@
->setUser($viewer);
$view = $builder->buildView();
- $clear_uri->setQueryParam(
+ $clear_uri->replaceQueryParam(
'chronoKey',
head($notifications)->getChronologicalKey());
} else {
diff --git a/src/applications/oauthserver/PhabricatorOAuthResponse.php b/src/applications/oauthserver/PhabricatorOAuthResponse.php
--- a/src/applications/oauthserver/PhabricatorOAuthResponse.php
+++ b/src/applications/oauthserver/PhabricatorOAuthResponse.php
@@ -36,7 +36,7 @@
$base_uri = $this->getClientURI();
$query_params = $this->buildResponseDict();
foreach ($query_params as $key => $value) {
- $base_uri->setQueryParam($key, $value);
+ $base_uri->replaceQueryParam($key, $value);
}
return $base_uri;
}
diff --git a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
--- a/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
+++ b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
@@ -306,7 +306,7 @@
foreach ($params as $key => $value) {
if (strlen($value)) {
- $full_uri->setQueryParam($key, $value);
+ $full_uri->replaceQueryParam($key, $value);
}
}
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -133,7 +133,7 @@
);
$login_uri = id(new PhutilURI('/login/'))
- ->setQueryParam('next', (string)$this->getRequestURI());
+ ->replaceQueryParam('next', (string)$this->getRequestURI());
$config = array(
'mockID' => $mock->getID(),
diff --git a/src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php b/src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
--- a/src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
+++ b/src/applications/phortune/controller/payment/PhortunePaymentMethodCreateController.php
@@ -143,7 +143,7 @@
"cart/{$cart_id}/checkout/?paymentMethodID=".$method->getID());
} else if ($subscription_id) {
$next_uri = new PhutilURI($cancel_uri);
- $next_uri->setQueryParam('added', true);
+ $next_uri->replaceQueryParam('added', true);
} else {
$account_uri = $this->getApplicationURI($account->getID().'/');
$next_uri = new PhutilURI($account_uri);
diff --git a/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php b/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
--- a/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
+++ b/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
@@ -118,8 +118,8 @@
$uri = $this->getApplicationURI($account->getID().'/card/new/');
$uri = new PhutilURI($uri);
- $uri->setQueryParam('merchantID', $merchant->getID());
- $uri->setQueryParam('subscriptionID', $subscription->getID());
+ $uri->replaceQueryParam('merchantID', $merchant->getID());
+ $uri->replaceQueryParam('subscriptionID', $subscription->getID());
$add_method_button = phutil_tag(
'a',
diff --git a/src/applications/ponder/view/PonderAddAnswerView.php b/src/applications/ponder/view/PonderAddAnswerView.php
--- a/src/applications/ponder/view/PonderAddAnswerView.php
+++ b/src/applications/ponder/view/PonderAddAnswerView.php
@@ -66,7 +66,7 @@
if (!$viewer->isLoggedIn()) {
$login_href = id(new PhutilURI('/auth/start/'))
- ->setQueryParam('next', '/Q'.$question->getID());
+ ->replaceQueryParam('next', '/Q'.$question->getID());
$form = id(new PHUIFormLayoutView())
->addClass('login-to-participate')
->appendChild(
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -284,7 +284,7 @@
$query_key = $saved_query->getQueryKey();
$bulk_uri = new PhutilURI("/maniphest/bulk/query/{$query_key}/");
- $bulk_uri->setQueryParam('board', $this->id);
+ $bulk_uri->replaceQueryParam('board', $this->id);
return id(new AphrontRedirectResponse())
->setURI($bulk_uri);
@@ -878,7 +878,7 @@
}
$uri = $this->getURIWithState($uri)
- ->setQueryParam('filter', null);
+ ->removeQueryParam('filter');
$item->setHref($uri);
$items[] = $item;
@@ -966,12 +966,12 @@
if ($show_hidden) {
$hidden_uri = $this->getURIWithState()
- ->setQueryParam('hidden', null);
+ ->removeQueryParam('hidden');
$hidden_icon = 'fa-eye-slash';
$hidden_text = pht('Hide Hidden Columns');
} else {
$hidden_uri = $this->getURIWithState()
- ->setQueryParam('hidden', 'true');
+ ->replaceQueryParam('hidden', 'true');
$hidden_icon = 'fa-eye';
$hidden_text = pht('Show Hidden Columns');
}
@@ -999,7 +999,7 @@
->setHref($manage_uri);
$batch_edit_uri = $request->getRequestURI();
- $batch_edit_uri->setQueryParam('batch', self::BATCH_EDIT_ALL);
+ $batch_edit_uri->replaceQueryParam('batch', self::BATCH_EDIT_ALL);
$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
@@ -1090,7 +1090,7 @@
}
$batch_edit_uri = $request->getRequestURI();
- $batch_edit_uri->setQueryParam('batch', $column->getID());
+ $batch_edit_uri->replaceQueryParam('batch', $column->getID());
$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
@@ -1103,7 +1103,7 @@
->setDisabled(!$can_batch_edit);
$batch_move_uri = $request->getRequestURI();
- $batch_move_uri->setQueryParam('move', $column->getID());
+ $batch_move_uri->replaceQueryParam('move', $column->getID());
$column_items[] = id(new PhabricatorActionView())
->setIcon('fa-arrow-right')
->setName(pht('Move Tasks to Column...'))
@@ -1111,7 +1111,7 @@
->setWorkflow(true);
$query_uri = $request->getRequestURI();
- $query_uri->setQueryParam('queryColumnID', $column->getID());
+ $query_uri->replaceQueryParam('queryColumnID', $column->getID());
$column_items[] = id(new PhabricatorActionView())
->setName(pht('View as Query'))
@@ -1188,18 +1188,22 @@
$base = new PhutilURI($base);
if ($force || ($this->sortKey != $this->getDefaultSort($project))) {
- $base->setQueryParam('order', $this->sortKey);
+ $base->replaceQueryParam('order', $this->sortKey);
} else {
- $base->setQueryParam('order', null);
+ $base->removeQueryParam('order');
}
if ($force || ($this->queryKey != $this->getDefaultFilter($project))) {
- $base->setQueryParam('filter', $this->queryKey);
+ $base->replaceQueryParam('filter', $this->queryKey);
} else {
- $base->setQueryParam('filter', null);
+ $base->removeQueryParam('filter');
}
- $base->setQueryParam('hidden', $this->showHidden ? 'true' : null);
+ if ($this->showHidden) {
+ $base->replaceQueryParam('hidden', 'true');
+ } else {
+ $base->removeQueryParam('hidden');
+ }
return $base;
}
diff --git a/src/applications/project/controller/PhabricatorProjectColumnHideController.php b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
--- a/src/applications/project/controller/PhabricatorProjectColumnHideController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnHideController.php
@@ -41,7 +41,7 @@
$view_uri = $this->getApplicationURI('/board/'.$project_id.'/');
$view_uri = new PhutilURI($view_uri);
foreach ($request->getPassthroughRequestData() as $key => $value) {
- $view_uri->setQueryParam($key, $value);
+ $view_uri->replaceQueryParam($key, $value);
}
if ($column->isDefaultColumn()) {
diff --git a/src/applications/project/controller/PhabricatorProjectDefaultController.php b/src/applications/project/controller/PhabricatorProjectDefaultController.php
--- a/src/applications/project/controller/PhabricatorProjectDefaultController.php
+++ b/src/applications/project/controller/PhabricatorProjectDefaultController.php
@@ -54,7 +54,7 @@
$view_uri = $this->getApplicationURI("board/{$id}/");
$view_uri = new PhutilURI($view_uri);
foreach ($request->getPassthroughRequestData() as $key => $value) {
- $view_uri->setQueryParam($key, $value);
+ $view_uri->replaceQueryParam($key, $value);
}
if ($request->isFormPost()) {
diff --git a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
--- a/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
+++ b/src/applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php
@@ -96,7 +96,7 @@
private function buildReleephRequestURI(ReleephBranch $branch) {
$uri = $branch->getURI('request/');
return id(new PhutilURI($uri))
- ->setQueryParam('D', $this->revision->getID());
+ ->replaceQueryParam('D', $this->revision->getID());
}
}
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
@@ -905,7 +905,7 @@
$engine = $this->getSearchEngine();
$nux_uri = $engine->getQueryBaseURI();
$nux_uri = id(new PhutilURI($nux_uri))
- ->setQueryParam('nux', true);
+ ->replaceQueryParam('nux', true);
$actions[] = id(new PhabricatorActionView())
->setIcon('fa-user-plus')
@@ -915,7 +915,7 @@
if ($is_dev) {
$overheated_uri = $this->getRequest()->getRequestURI()
- ->setQueryParam('overheated', true);
+ ->replaceQueryParam('overheated', true);
$actions[] = id(new PhabricatorActionView())
->setIcon('fa-fire')
diff --git a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
@@ -219,7 +219,7 @@
foreach ($providers as $provider_phid => $provider) {
$provider_uri = id(new PhutilURI($this->getPanelURI()))
- ->setQueryParam('providerPHID', $provider_phid);
+ ->replaceQueryParam('providerPHID', $provider_phid);
$is_enabled = $provider->canCreateNewConfiguration($viewer);
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
@@ -198,7 +198,7 @@
$viewer = $this->getViewer();
if (!$viewer->isLoggedIn()) {
$uri = id(new PhutilURI('/login/'))
- ->setQueryParam('next', (string)$this->getRequestURI());
+ ->replaceQueryParam('next', (string)$this->getRequestURI());
return id(new PHUIObjectBoxView())
->setFlush(true)
->appendChild(
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
@@ -126,10 +126,10 @@
$results = array_slice($results, 0, $limit, $preserve_keys = true);
if (($offset + (2 * $limit)) < $hard_limit) {
$next_uri = id(new PhutilURI($request->getRequestURI()))
- ->setQueryParam('offset', $offset + $limit)
- ->setQueryParam('q', $query)
- ->setQueryParam('raw', $raw_query)
- ->setQueryParam('format', 'html');
+ ->replaceQueryParam('offset', $offset + $limit)
+ ->replaceQueryParam('q', $query)
+ ->replaceQueryParam('raw', $raw_query)
+ ->replaceQueryParam('format', 'html');
$next_link = javelin_tag(
'a',
@@ -248,7 +248,9 @@
$parameters = $source->getParameters();
if ($parameters) {
$reference_uri = (string)id(new PhutilURI($reference_uri))
- ->setQueryParam('parameters', phutil_json_encode($parameters));
+ ->replaceQueryParam(
+ 'parameters',
+ phutil_json_encode($parameters));
}
$reference_link = phutil_tag(
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/env/PhabricatorEnv.php
--- a/src/infrastructure/env/PhabricatorEnv.php
+++ b/src/infrastructure/env/PhabricatorEnv.php
@@ -475,11 +475,17 @@
* @task read
*/
public static function getDoclink($resource, $type = 'article') {
- $uri = new PhutilURI('https://secure.phabricator.com/diviner/find/');
- $uri->setQueryParam('name', $resource);
- $uri->setQueryParam('type', $type);
- $uri->setQueryParam('jump', true);
- return (string)$uri;
+ $params = array(
+ 'name' => $resource,
+ 'type' => $type,
+ 'jump' => true,
+ );
+
+ $uri = new PhutilURI(
+ 'https://secure.phabricator.com/diviner/find/',
+ $params);
+
+ return phutil_string_cast($uri);
}
diff --git a/src/view/phui/PHUITimelineView.php b/src/view/phui/PHUITimelineView.php
--- a/src/view/phui/PHUITimelineView.php
+++ b/src/view/phui/PHUITimelineView.php
@@ -154,8 +154,8 @@
}
$uri = $this->getPager()->getNextPageURI();
- $uri->setQueryParam('quoteTargetID', $this->getQuoteTargetID());
- $uri->setQueryParam('quoteRef', $this->getQuoteRef());
+ $uri->replaceQueryParam('quoteTargetID', $this->getQuoteTargetID());
+ $uri->replaceQueryParam('quoteRef', $this->getQuoteRef());
$events[] = javelin_tag(
'div',
array(

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 2:44 PM (2 w, 1 d ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/xg/3b/3nmaqr6k6bha5vv6
Default Alt Text
D20154.id48161.diff (31 KB)

Event Timeline

Phabricator · Built by Phacility