Page MenuHomePhabricator
Files F14291085

D20150.diff
No OneTemporary
Actions

D20150.diff
View Options

diff --git a/src/aphront/response/AphrontAjaxResponse.php b/src/aphront/response/AphrontAjaxResponse.php
--- a/src/aphront/response/AphrontAjaxResponse.php
+++ b/src/aphront/response/AphrontAjaxResponse.php
@@ -32,22 +32,21 @@
}
public function buildResponseString() {
+ $request = $this->getRequest();
$console = $this->getConsole();
if ($console) {
// NOTE: We're stripping query parameters here both for readability and
// to mitigate BREACH and similar attacks. The parameters are available
// in the "Request" tab, so this should not impact usability. See T3684.
- $uri = $this->getRequest()->getRequestURI();
- $uri = new PhutilURI($uri);
- $uri->setQueryParams(array());
+ $path = $request->getPath();
Javelin::initBehavior(
'dark-console',
array(
- 'uri' => (string)$uri,
- 'key' => $console->getKey($this->getRequest()),
+ 'uri' => $path,
+ 'key' => $console->getKey($request),
'color' => $console->getColor(),
- 'quicksand' => $this->getRequest()->isQuicksand(),
+ 'quicksand' => $request->isQuicksand(),
));
}
@@ -60,7 +59,6 @@
$response = CelerityAPI::getStaticResourceResponse();
- $request = $this->getRequest();
if ($request) {
$viewer = $request->getViewer();
if ($viewer) {
diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
@@ -11,8 +11,7 @@
$viewer = $request->getViewer();
$id = $request->getURIData('channelID');
- $uri = clone $request->getRequestURI();
- $uri->setQueryParams(array());
+ $uri = new PhutilURI($request->getPath());
$pager = new AphrontCursorPagerView();
$pager->setURI($uri);
diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
--- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
+++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
@@ -54,8 +54,7 @@
return new Aphront404Response();
}
- $uri = $request->getRequestURI();
- $uri->setQueryParams(array());
+ $uri = new PhutilURI($request->getPath());
$new = $request->getStr('new');
$edit = $request->getInt('edit');
diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -31,8 +31,7 @@
$user = $this->getUser();
$editable = PhabricatorEnv::getEnvConfig('account.editable');
- $uri = $request->getRequestURI();
- $uri->setQueryParams(array());
+ $uri = new PhutilURI($request->getPath());
if ($editable) {
$new = $request->getStr('new');
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
@@ -1279,8 +1279,7 @@
$fields = $this->willBuildEditForm($object, $fields);
- $request_path = $request->getRequestURI()
- ->setQueryParams(array());
+ $request_path = $request->getPath();
$form = id(new AphrontFormView())
->setUser($viewer)

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 18, 9:15 AM (1 h, 3 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6901669
Default Alt Text
D20150.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility