archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -r1563 from trunk to branch-1_6 comments.php: cleanup url (t=1 in the

Browse source 
url for an unknown reason) and image urls work now with all url styles

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1576 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2006-10-24 04:04:27 +00:00
parent 0fdfd9081a
commit b8cf9d8fd9
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
comments.php
View file

@ -308,7 +308,7 @@ $query.= '
;';
list($counter) = mysql_fetch_row(pwg_query($query));
$url = PHPWG_ROOT_PATH.'comments.php?t=1'.get_query_string_diff(array('start'));
$url = PHPWG_ROOT_PATH.'comments.php'.get_query_string_diff(array('start'));
$navbar = create_navigation_bar($url,
$counter,
@ -382,7 +382,7 @@ SELECT id, name, file, path, tn_ext
// retrieving category informations
$categories = array();
$query = '
SELECT id, uppercats
SELECT id, name, uppercats
FROM '.CATEGORIES_TABLE.'
WHERE id IN ('.implode(',', $category_ids).')
;';
@ -417,6 +417,7 @@ SELECT id, uppercats
$url = make_picture_url(
array(
'category' => $comment['category_id'],
'cat_name' => $categories[ $comment['category_id']] ['name'],
'image_id' => $comment['image_id'],
'image_file' => $elements[$comment['image_id']]['file'],
)

3
include/functions_html.inc.php
View file

@ -82,7 +82,8 @@ function create_navigation_bar(
global $lang, $conf;
$pages_around = $conf['paginate_pages_around'];
$start_str = $clean_url ? '/start-' : '&start=';
$start_str = $clean_url ? '/start-' :
( ( strstr($url, '?')===false ? '?':'&') . 'start=' );
$navbar = '';