Changeset 1576 for branches


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_6/comments.php

    r1535 r1576  
    309309list($counter) = mysql_fetch_row(pwg_query($query));
    310310
    311 $url = PHPWG_ROOT_PATH.'comments.php?t=1'.get_query_string_diff(array('start'));
     311$url = PHPWG_ROOT_PATH.'comments.php'.get_query_string_diff(array('start'));
    312312
    313313$navbar = create_navigation_bar($url,
     
    383383  $categories = array();
    384384  $query = '
    385 SELECT id, uppercats
     385SELECT id, name, uppercats
    386386  FROM '.CATEGORIES_TABLE.'
    387387  WHERE id IN ('.implode(',', $category_ids).')
     
    418418            array(
    419419              'category' => $comment['category_id'],
     420              'cat_name' => $categories[ $comment['category_id']] ['name'],
    420421              'image_id' => $comment['image_id'],
    421422              'image_file' => $elements[$comment['image_id']]['file'],
  • branches/branch-1_6/include/functions_html.inc.php

    r1309 r1576  
    8383
    8484  $pages_around = $conf['paginate_pages_around'];
    85   $start_str = $clean_url ? '/start-' : '&start=';
     85  $start_str = $clean_url ? '/start-' :
     86             ( ( strstr($url, '?')===false ? '?':'&') . 'start=' );
    8687
    8788  $navbar = '';
Note: See TracChangeset for help on using the changeset viewer.