diff options
| author | rvelices <rv-github@modusoptimus.com> | 2006-10-24 04:04:27 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2006-10-24 04:04:27 +0000 |
| commit | b8cf9d8fd990fdb34a14f36b867714d116c672b3 (patch) | |
| tree | 235b1765c483f8ca5b11d4eb9f19460b65992868 | |
| parent | 0fdfd9081ac89646c1bc087442ad81add459a817 (diff) | |
merge -r1563 from trunk to branch-1_6 comments.php: cleanup url (t=1 in the
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
| -rw-r--r-- | comments.php | 5 | ||||
| -rw-r--r-- | include/functions_html.inc.php | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/comments.php b/comments.php index 829a7055e..28f4bf410 100644 --- a/comments.php +++ b/comments.php @@ -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'], ) diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 993c46dea..58cf3b8e1 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -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 = ''; |