diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/category_cats.inc.php | 14 | ||||
| -rw-r--r-- | include/category_default.inc.php | 12 | ||||
| -rw-r--r-- | include/menubar.inc.php | 1 |
3 files changed, 13 insertions, 14 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( diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 8dad04d90..5ee88a275 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -107,11 +107,11 @@ foreach ($pictures as $row) $tpl_var = array( 'ID' => $row['id'], - 'IMAGE' => $thumbnail_url, - 'IMAGE_ALT' => $row['file'], - 'IMAGE_TITLE' => get_thumbnail_title($row), - 'IMAGE_TS' => get_icon($row['date_available']), - 'U_IMG_LINK' => $url, + 'TN_SRC' => $thumbnail_url, + 'TN_ALT' => $row['file'], + 'TN_TITLE' => get_thumbnail_title($row), + 'ICON_TS' => get_icon($row['date_available']), + 'URL' => $url, ); if ($user['show_nb_hits']) @@ -147,7 +147,7 @@ foreach ($pictures as $row) } } - $tpl_var['ELEMENT_NAME'] = $name; + $tpl_var['NAME'] = $name; } if ( isset($nb_comments_of) ) diff --git a/include/menubar.inc.php b/include/menubar.inc.php index b04a960a8..6e9f73a86 100644 --- a/include/menubar.inc.php +++ b/include/menubar.inc.php @@ -266,6 +266,7 @@ function initialize_menu() $template->assign( array( 'U_LOGIN' => get_root_url().'identification.php', + 'U_LOST_PASSWORD' => get_root_url().'password.php', 'AUTHORIZE_REMEMBERING' => $conf['authorize_remembering'] ) ); |