Commit 7c98a639 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Merge commit 'origin/master' into files-blockconfig

parents 923c4606 73ca250b
...@@ -411,7 +411,7 @@ abstract class ArtefactTypeFileBase extends ArtefactType { ...@@ -411,7 +411,7 @@ abstract class ArtefactTypeFileBase extends ArtefactType {
} }
public static function get_my_files_data($parentfolderid, $userid, $group=null, $institution=null, $idkeys=true) { public static function get_my_files_data($parentfolderid, $userid, $group=null, $institution=null) {
$select = ' $select = '
SELECT SELECT
a.id, a.artefacttype, a.mtime, f.size, a.title, a.description, a.id, a.artefacttype, a.mtime, f.size, a.title, a.description,
...@@ -514,12 +514,6 @@ abstract class ArtefactTypeFileBase extends ArtefactType { ...@@ -514,12 +514,6 @@ abstract class ArtefactTypeFileBase extends ArtefactType {
} }
uasort($filedata, array("ArtefactTypeFileBase", "my_files_cmp")); uasort($filedata, array("ArtefactTypeFileBase", "my_files_cmp"));
if (!$idkeys) {
// Temporary: allow blog attachment stuff to continue to
// work with the old file.js & tablerenderer.js
return array_values($filedata);
}
return $filedata; return $filedata;
} }
......
Supports Markdown
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