Changeset 1576 for branches

Timestamp:

Oct 24, 2006, 6:04:27 AM (18 years ago)

Author:

rvelices

Message:

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

Location:

branches/branch-1_6

Files:

• comments.php (modified) (3 diffs)
• include/functions_html.inc.php (modified) (1 diff)

branches/branch-1_6/comments.php

@@ -309 +309 @@
 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,
@@ -383 +383 @@
   $categories = array();
   $query = '
-SELECT id, uppercats
+SELECT id, name, uppercats
   FROM '.CATEGORIES_TABLE.'
   WHERE id IN ('.implode(',', $category_ids).')
@@ -418 +418 @@
             array(
               'category' => $comment['category_id'],
+              'cat_name' => $categories[ $comment['category_id']] ['name'],
               'image_id' => $comment['image_id'],
               'image_file' => $elements[$comment['image_id']]['file'],

branches/branch-1_6/include/functions_html.inc.php

@@ -83 +83 @@
 
   $pages_around = $conf['paginate_pages_around'];
-  $start_str = $clean_url ? '/start-' : '&start=';
+  $start_str = $clean_url ? '/start-' :
+             ( ( strstr($url, '?')===false ? '?':'&') . 'start=' );
 
   $navbar = '';