Post merge conflicts

This commit is contained in:
Matias Griese
2020-12-01 09:51:43 +02:00
parent 432ef4bb1a
commit d9c73e2edb
4 changed files with 4 additions and 34 deletions

View File

@@ -2536,11 +2536,10 @@ class AdminController extends AdminBaseController
}
$this->uri = $this->uri ?? $this->grav['uri'];
$this->grav['twig']->twig_vars['current_form_data'] = (array)$this->data;
$field = (string)$this->uri->post('field', '');
$order = $this->uri->post('order') ?: null;
if (!is_array($order)) {
if ($order && is_string($order)) {
$order = array_map('trim', explode(',', $order));
}