aboutsummaryrefslogtreecommitdiffstats
path: root/include/category_cats.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-09-10 01:16:13 +0000
committerrvelices <rv-github@modusoptimus.com>2008-09-10 01:16:13 +0000
commit6ddb20d6f096fa51b5e820e1b2e19e93f4df0253 (patch)
tree20cf82c77918e07c30f92e3764fa58f9f60a1541 /include/category_cats.inc.php
parentd6b39bb4e127ab29beecb6793de7f72ce2a36397 (diff)
- fix undefined template vars U_LOST_PASSWORD (menubar), F_ACTION (extend_for_templates) and F_C13Y_ACTION (check_integrity)
- normalized some template variable names between category thumbnails and thumbnails (take advantage of full template change with smarty and do it now) git-svn-id: http://piwigo.org/svn/trunk@2515 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/category_cats.inc.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/category_cats.inc.php b/include/category_cats.inc.php
index c706ee496..c80ba918b 100644
--- a/include/category_cats.inc.php
+++ b/include/category_cats.inc.php
@@ -32,9 +32,8 @@ if ($page['section']=='recent_cats')
// $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
$query = '
SELECT
- id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
- date_last, max_date_last, count_images, count_categories, global_rank
- FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+ c.*, nb_images, date_last, max_date_last, count_images, count_categories
+ FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
ON id = cat_id and user_id = '.$user['id'].'
WHERE date_last >= SUBDATE(
CURRENT_DATE,INTERVAL '.$user['recent_period'].' DAY
@@ -54,9 +53,8 @@ else
// $user['forbidden_categories'] including with USER_CACHE_CATEGORIES_TABLE
$query = '
SELECT
- id, name, permalink, representative_picture_id, comment, nb_images, uppercats,
- date_last, max_date_last, count_images, count_categories
- FROM '.CATEGORIES_TABLE.' INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
+ c.*, nb_images, date_last, max_date_last, count_images, count_categories
+ FROM '.CATEGORIES_TABLE.' c INNER JOIN '.USER_CACHE_CATEGORIES_TABLE.'
ON id = cat_id and user_id = '.$user['id'].'
WHERE id_uppercat '.
(!isset($page['category']) ? 'is NULL' : '= '.$page['category']['id']).'
@@ -245,8 +243,8 @@ if (count($categories) > 0)
array(
'ID' => $category['id'],
'TN_SRC' => $thumbnail_src_of[$category['representative_picture_id']],
- 'ALT' => strip_tags($category['name']),
- 'ICON' => $icon_ts,
+ 'TN_ALT' => strip_tags($category['name']),
+ 'ICON_TS' => $icon_ts,
'URL' => make_index_url(
array(