- removed function get_extra_fields and its usage (unnecessary + perf issue when retrieving many image ids in a section)

- 2 fixes recent feed.php commit
  * month names were decalated by one
  * strptime function is not implemented under Windows in php
- added somme missing $ROOT_URL in templates

git-svn-id: http://piwigo.org/svn/trunk@6668 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-07-06 20:10:03 +00:00
parent 804d79a625
commit 4748adc3f5
9 changed files with 27 additions and 32 deletions

View File

@@ -289,7 +289,7 @@ SELECT id
// Main query
$query = '
SELECT DISTINCT(image_id)'.get_extra_fields($conf['order_by']).'
SELECT DISTINCT(image_id)
FROM '.IMAGE_CATEGORY_TABLE.'
INNER JOIN '.IMAGES_TABLE.' ON id = image_id
WHERE
@@ -323,7 +323,7 @@ else
if (!empty($items) )
{
$query = '
SELECT DISTINCT image_id'.get_extra_fields($conf['order_by']).'
SELECT DISTINCT image_id
FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.IMAGES_TABLE.' ON image_id=id
WHERE image_id IN ('.implode(',', $items).')
'.$forbidden.
@@ -438,7 +438,7 @@ SELECT image_id
}
$query = '
SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).'
SELECT DISTINCT(id)
FROM '.IMAGES_TABLE.'
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
WHERE
@@ -526,7 +526,7 @@ SELECT DISTINCT(id), average_rate
else if ($page['section'] == 'list')
{
$query ='
SELECT DISTINCT(id)'.get_extra_fields($conf['order_by']).'
SELECT DISTINCT(id)
FROM '.IMAGES_TABLE.'
INNER JOIN '.IMAGE_CATEGORY_TABLE.' AS ic ON id = ic.image_id
WHERE image_id IN ('.implode(',', $page['list']).')