fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-21 12:19:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/file/file.model.php
View file

@ -139,11 +139,15 @@
else
{
$fileList = array();
foreach($output->data AS $key=>$value)
if(is_array($output->data))
{
$file = $value;
$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
array_push($fileList, $file);
foreach($output->data as $key=>$value)
{
$file = $value;
$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
array_push($fileList, $file);
}
}
return $fileList;
}
@ -152,9 +156,9 @@
/**
* @brief Return all files which belong to a specific document
**/
function getFiles($upload_target_srl, $columnList = array()) {
function getFiles($upload_target_srl, $columnList = array(), $sortIndex = 'file_srl') {
$args->upload_target_srl = $upload_target_srl;
$args->sort_index = 'file_srl';
$args->sort_index = $sortIndex;
$output = executeQuery('file.getFiles', $args, $columnList);
if(!$output->data) return;