@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix URI construction of typeahead browse "more" pager
Summary: Ref T13251. See <https://phabricator.wikimedia.org/T216849>.
Test Plan:
- With more than 100 projects (or, set `$limit = 3`)...
- Edit a task, then click the "Browse" magnifying glass icon next to the "Tags" typeahead.
- Before change: fatal on 'q' being null.
- After change: no fatal.
Reviewers: amckinley, 20after4
Reviewed By: amckinley
Maniphest Tasks: T13251
Differential Revision: https://secure.phabricator.com/D20204
+12
-2
+12
-2
src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+12
-2
src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
···
127
127
if (($offset + (2 * $limit)) < $hard_limit) {
128
128
$next_uri = id(new PhutilURI($request->getRequestURI()))
129
129
->replaceQueryParam('offset', $offset + $limit)
130
-
->replaceQueryParam('q', $query)
131
-
->replaceQueryParam('raw', $raw_query)
132
130
->replaceQueryParam('format', 'html');
131
+
132
+
if ($query !== null) {
133
+
$next_uri->replaceQueryParam('q', $query);
134
+
} else {
135
+
$next_uri->removeQueryParam('q');
136
+
}
137
+
138
+
if ($raw_query !== null) {
139
+
$next_uri->replaceQueryParam('raw', $raw_query);
140
+
} else {
141
+
$next_uri->removeQueryParam('raw');
142
+
}
133
143
134
144
$next_link = javelin_tag(
135
145
'a',