Changeset 18668
- Timestamp:
- Oct 16, 2012, 9:59:08 PM (11 years ago)
- Location:
- branches/2.4
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/include/functions_html.inc.php
r17749 r18668 435 435 { 436 436 global $page; 437 $title = count($page['tags']) > 1 ? l10n('Tag') : l10n('Tag'); 438 $title.= ' '; 437 $title = '<a href="'.get_root_url().'tags.php" title="'.l10n('display available tags').'">' 438 . l10n( count($page['tags']) > 1 ? 'Tags' : 'Tag' ) 439 . '</a> '; 439 440 440 441 for ($i=0; $i<count($page['tags']); $i++) … … 455 456 .'</a>'; 456 457 457 $remove_url = null; 458 if (count($page['tags']) == 1) 459 { 460 $remove_url = get_root_url().'tags.php'; 461 } 462 else 458 if (count($page['tags']) > 2) 463 459 { 464 460 $other_tags = $page['tags']; … … 469 465 ) 470 466 ); 471 } 472 473 $title.=474 '<a href="'.$remove_url.'" style="border:none;" title="'475 .l10n('remove this tag from the list')476 .'"><img src="'477 . get_root_url().get_themeconf('icon_dir').'/remove_s.png'478 .'" alt="x" style="vertical-align:bottom;">'479 .'</a>';467 468 $title.= 469 '<a href="'.$remove_url.'" style="border:none;" title="' 470 .l10n('remove this tag from the list') 471 .'"><img src="' 472 .get_root_url().get_themeconf('icon_dir').'/remove_s.png' 473 .'" alt="x" style="vertical-align:bottom;">' 474 .'</a>'; 475 } 480 476 } 481 477 return $title; -
branches/2.4/index.php
r16988 r18668 100 100 else 101 101 { 102 $canonical_url = duplicate_index_url(); 102 $start = $page['nb_image_page'] * round($page['start'] / $page['nb_image_page']); 103 if ($start>0 && $start >= count($page['items']) ) 104 { 105 $start -= $page['nb_image_page']; 106 } 107 $canonical_url = duplicate_index_url(array('start' => $start)); 103 108 } 104 109 $template->assign('U_CANONICAL', $canonical_url);
Note: See TracChangeset
for help on using the changeset viewer.