diff --git a/SeedDMS_Core/Core/inc.ClassFolder.php b/SeedDMS_Core/Core/inc.ClassFolder.php
index c97cd2be9..3f677f7e4 100644
--- a/SeedDMS_Core/Core/inc.ClassFolder.php
+++ b/SeedDMS_Core/Core/inc.ClassFolder.php
@@ -432,9 +432,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *
 	 * @param string $orderby if set to 'n' the list is ordered by name, otherwise
 	 *        it will be ordered by sequence
+	 * @param string $dir direction of sorting (asc or desc)
 	 * @return array list of folder objects or false in case of an error
 	 */
-	function getSubFolders($orderby="") { /* {{{ */
+	function getSubFolders($orderby="", $dir="asc") { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_subFolders)) {
@@ -442,6 +443,10 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 
 			if ($orderby=="n") $queryStr .= " ORDER BY name";
 			elseif ($orderby=="s") $queryStr .= " ORDER BY sequence";
+			elseif ($orderby=="d") $queryStr .= " ORDER BY date";
+			if($dir == 'desc')
+				$queryStr .= " DESC";
+
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && $resArr == false)
 				return false;
@@ -612,15 +617,19 @@ class SeedDMS_Core_Folder extends SeedDMS_Core_Object {
 	 *
 	 * @param string $orderby if set to 'n' the list is ordered by name, otherwise
 	 *        it will be ordered by sequence
+	 * @param string $dir direction of sorting (asc or desc)
 	 * @return array list of documents or false in case of an error
 	 */
-	function getDocuments($orderby="") { /* {{{ */
+	function getDocuments($orderby="", $dir="asc") { /* {{{ */
 		$db = $this->_dms->getDB();
 
 		if (!isset($this->_documents)) {
 			$queryStr = "SELECT * FROM tblDocuments WHERE folder = " . $this->_id;
 			if ($orderby=="n") $queryStr .= " ORDER BY name";
 			elseif($orderby=="s") $queryStr .= " ORDER BY sequence";
+			elseif($orderby=="d") $queryStr .= " ORDER BY date";
+			if($dir == 'desc')
+				$queryStr .= " DESC";
 
 			$resArr = $db->getResultArray($queryStr);
 			if (is_bool($resArr) && !$resArr)