aboutsummaryrefslogtreecommitdiffstats
path: root/include/category_cats.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-01-17 21:58:18 +0000
committerrvelices <rv-github@modusoptimus.com>2012-01-17 21:58:18 +0000
commitcc01941ed97f6c8f6790931bfc167ba45c5a8f91 (patch)
treefe465d457c034efba03cfe26d65b5467d88bfca2 /include/category_cats.inc.php
parente1bd64fdfc50f3ef50c0b4391c4586bbaeacb287 (diff)
feature 2548 multisize - code cleanup + better usage in category_cats + i.php logs memory usage peak
git-svn-id: http://piwigo.org/svn/trunk@12920 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_cats.inc.php33
1 files changed, 12 insertions, 21 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index 2ecdf5ec2..cce9ac520 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -189,7 +189,6 @@ SELECT *
{
if ($row['level'] <= $user['level'])
{
- $row['tn_src'] = DerivativeImage::thumb_url($row);
$infos_of_image[$row['id']] = $row;
}
else
@@ -236,10 +235,15 @@ SELECT *
$result = pwg_query($query);
while ($row = pwg_db_fetch_assoc($result))
{
- $row['tn_src'] = DerivativeImage::thumb_url($row);
$infos_of_image[$row['id']] = $row;
}
}
+
+ foreach ($infos_of_image as &$info)
+ {
+ $info['src_image'] = new SrcImage($info);
+ }
+ unset($info);
}
if (count($user_representative_updates_for))
@@ -311,7 +315,7 @@ if (count($categories) > 0)
$tpl_var =
array(
'ID' => $category['id'],
- 'TN_SRC' => $representative_infos['tn_src'],
+ 'representative' => $representative_infos,
'TN_ALT' => strip_tags($category['name']),
'URL' => make_index_url(
@@ -333,23 +337,6 @@ if (count($categories) > 0)
@$category['comment'],
'subcatify_category_description')),
'NAME' => $name,
-
- // Extra fields for usage in extra themes
- 'FILE_PATH' => $representative_infos['path'],
- 'FILE_POSTED' => $representative_infos['date_available'],
- 'FILE_CREATED' => $representative_infos['date_creation'],
- 'FILE_DESC' => $representative_infos['comment'],
- 'FILE_AUTHOR' => $representative_infos['author'],
- 'FILE_HIT' => $representative_infos['hit'],
- 'FILE_SIZE' => $representative_infos['filesize'],
- 'FILE_WIDTH' => $representative_infos['width'],
- 'FILE_HEIGHT' => $representative_infos['height'],
- 'FILE_METADATE' => $representative_infos['date_metadata_update'],
- 'FILE_HAS_HD' => $representative_infos['has_high'],
- 'FILE_HD_WIDTH' => $representative_infos['high_width'],
- 'FILE_HD_HEIGHT' => $representative_infos['high_height'],
- 'FILE_HD_FILESIZE' => $representative_infos['high_filesize'],
- 'FILE_RATING_SCORE' => $representative_infos['rating_score'],
);
if ($conf['index_new_icon'])
{
@@ -387,8 +374,12 @@ if (count($categories) > 0)
$tpl_thumbnails_var[] = $tpl_var;
}
+ $derivative_params = trigger_event('get_index_album_derivative_params', ImageStdParams::get_by_type(IMG_SMALL) );
$tpl_thumbnails_var = trigger_event('loc_end_index_category_thumbnails', $tpl_thumbnails_var, $categories);
- $template->assign( 'category_thumbnails', $tpl_thumbnails_var);
+ $template->assign( array(
+ 'category_thumbnails' => $tpl_thumbnails_var,
+ 'derivative_params' => $derivative_params,
+ ) );
$template->assign_var_from_handle('CATEGORIES', 'index_category_thumbnails');
}