Merge branch 'j4/media/icons-permissions' of github.com:Digital-Peak/…

…joomla-cms into j4/media/icons-permissions
joomla · Feb 7, 2022 · 7af35b1 · 7af35b1
2 parents 3fc11cc + bde2665
commit 7af35b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ git clone git@github.com:joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 4.1-dev branch:
+- Go to the 4.2-dev branch:
 ```bash
 git checkout 4.2-dev
 ```

diff --git a/api/components/com_content/src/Controller/ArticlesController.php b/api/components/com_content/src/Controller/ArticlesController.php
@@ -75,6 +75,18 @@ public function displayList()
 			$this->modelState->set('filter.language', $filter->clean($apiFilterInfo['language'], 'STRING'));
 		}
 
+		$apiListInfo = $this->input->get('list', [], 'array');
+
+		if (array_key_exists('ordering', $apiListInfo))
+		{
+			$this->modelState->set('list.ordering', $filter->clean($apiListInfo['ordering'], 'STRING'));
+		}
+
+		if (array_key_exists('direction', $apiListInfo))
+		{
+			$this->modelState->set('list.direction', $filter->clean($apiListInfo['direction'], 'STRING'));
+		}
+
 		return parent::displayList();
 	}