From 95eb3bcf0955f109fbab940ab8de045abee98c61 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Tue, 6 Mar 2012 15:52:22 -0800
Subject: [PATCH] Respect query string when redirecting from missing trailing /

Test Plan: /differential/filter/active/jakubv?status=all

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1798
---
 .../AphrontApplicationConfiguration.php                      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php b/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
index 97b930e069..c5ede0aac7 100644
--- a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
+++ b/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,8 @@ abstract class AphrontApplicationConfiguration {
         // to add a trailing slash and issue a redirect if that resolves.
         list($controller_class, $uri_data) = $mapper->mapPath($path.'/');
         if ($controller_class) {
-          return $this->buildRedirectController($path.'/');
+          $uri = $request->getRequestURI()->setPath($path.'/');
+          return $this->buildRedirectController($uri);
         }
       }