merge r11115 from branch 2.2 to trunk

feature 2244 added: web API methods pwg.categories.getImages,
pwg.tags.getImages and pwg.images.search now give the date_creation
and date_available for each returned photo.



git-svn-id: http://piwigo.org/svn/trunk@11116 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2011-05-30 21:32:10 +00:00
parent b3dcaf91b4
commit 5159af4e09
+4 -4
View File
@@ -165,7 +165,7 @@ function ws_std_get_urls($image_row)
function ws_std_get_image_xml_attributes()
{
return array(
'id','tn_url','element_url','high_url', 'file','width','height','hit'
'id','tn_url','element_url','high_url', 'file','width','height','hit','date_available','date_creation'
);
}
@@ -372,7 +372,7 @@ LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['p
$image[$k] = (int)$row[$k];
}
}
foreach ( array('file', 'name', 'comment') as $k )
foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}
@@ -931,7 +931,7 @@ SELECT * FROM '.IMAGES_TABLE.'
$image[$k] = (int)$row[$k];
}
}
foreach ( array('file', 'name', 'comment') as $k )
foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}
@@ -1711,7 +1711,7 @@ SELECT * FROM '.IMAGES_TABLE.'
$image[$k] = (int)$row[$k];
}
}
foreach ( array('file', 'name', 'comment') as $k )
foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}