feature:2269 merge r10648&r10649 from trunk

git-svn-id: http://piwigo.org/svn/branches/2.2@10650 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2011-04-27 21:59:46 +00:00
parent a843760442
commit 9a15f40a85
9 changed files with 51 additions and 3 deletions
+1
View File
@@ -263,6 +263,7 @@ SELECT
array(
'ID' => $row['id'],
'TN_SRC' => $src,
'FILE_SRC' => $row['path'],
'LEGEND' => !empty($row['name']) ?
$row['name'] : get_name_from_file($row['file']),
'U_EDIT' =>