adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-11 11:13:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 77: standard navigation link - finalized

Browse Source 
3 small fixes: simplified code (unnecessary $page['tab_expand']),
urls in comments (at end of line nl2br issue+regex+html 4 validated) and 
$page['where'] correction for most_visited


git-svn-id: http://piwigo.org/svn/trunk@1031 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-02-10 02:10:41 +00:00
parent c8e9793412
commit da21a99873
6 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_category.inc.php
+10 -9
View File
@@ -132,9 +132,9 @@ SELECT name,id,date_last,nb_images,global_rank
{
$query.= '
AND (id_uppercat is NULL';
if (isset ($page['tab_expand']) and count($page['tab_expand']) > 0)
if ( isset( $page['cat'] ) and is_numeric( $page['cat'] ) )
{
$query.= ' OR id_uppercat IN ('.implode(',',$page['tab_expand']).')';
$query.= ' OR id_uppercat IN ('.$page['uppercats'].')';
}
$query.= ')';
}
@@ -323,12 +323,12 @@ function get_category_preferred_image_orders()
{
global $conf;
return array(
array('Default', '', true),
array(get_lang('best_rated_cat'), 'average_rate DESC', $conf['rate']),
array(get_lang('most_visited_cat'), 'hit DESC', true),
array(get_lang('Creation date'), 'date_creation DESC', true),
array(get_lang('Availability date'), 'date_available DESC', true),
array(get_lang('File name'), 'file ASC', true)
array('Default', '', true),
array(l10n('best_rated_cat'), 'average_rate DESC', $conf['rate']),
array(l10n('most_visited_cat'), 'hit DESC', true),
array(l10n('Creation date'), 'date_creation DESC', true),
array(l10n('Availability date'), 'date_available DESC', true),
array(l10n('File name'), 'file ASC', true)
);
}
@@ -371,6 +371,7 @@ function initialize_category( $calling_page = 'category' )
$page['cat_site_id'] = $result['site_id'];
$page['cat_uploadable'] = $result['uploadable'];
$page['cat_commentable'] = $result['commentable'];
$page['cat_id_uppercat'] = $result['id_uppercat'];
$page['uppercats'] = $result['uppercats'];
$page['title'] =
get_cat_display_name($page['cat_name'],
@@ -468,7 +469,7 @@ SELECT COUNT(DISTINCT(id)) AS nb_total_images
$page['where'] = 'WHERE hit > 0';
if (isset($forbidden))
{
$page['where'] = "\n".' AND '.$forbidden;
$page['where'] .= "\n".' AND '.$forbidden;
}
$conf['order_by'] = ' ORDER BY hit DESC, file ASC';