Commit a5343cbe authored by alexpott's avatar alexpott

Issue #1999450 by aaronott: Use Symfony Request for views module.

parent 949f67b3
......@@ -290,9 +290,10 @@ public function generateResultsKey() {
'langcode' => language(Language::TYPE_INTERFACE)->langcode,
'base_url' => $GLOBALS['base_url'],
);
$request = \Drupal::request();
foreach (array('exposed_info', 'page', 'sort', 'order', 'items_per_page', 'offset') as $key) {
if (isset($_GET[$key])) {
$key_data[$key] = $_GET[$key];
if ($request->query->has($key)) {
$key_data[$key] = $request->query->get($key);
}
}
......
......@@ -862,7 +862,7 @@ public function getHandlers($type) {
// If this is during form submission and there are temporary options
// which can only appear if the view is in the edit cache, use those
// options instead. This is used for AJAX multi-step stuff.
if (isset($_POST['form_id']) && isset($this->view->temporary_options[$type][$id])) {
if (\Drupal::request()->request->get('form_id') && isset($this->view->temporary_options[$type][$id])) {
$info = $this->view->temporary_options[$type][$id];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment