fix: remote site decodes html entities from xml and addslashes
fix: picture displays "image rank/total" images even for non numeric categories fix: category comment not transformed with nl2br if allow_html_descriptions and comment already looks like html git-svn-id: http://piwigo.org/svn/trunk@1046 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
f27bd8558a
commit
08b6381564
4 changed files with 11 additions and 7 deletions
|
|
@ -529,17 +529,15 @@ if ( isset( $_GET['slideshow'] ) and isset($page['next_item']) )
|
|||
}
|
||||
|
||||
$title_img = $picture['current']['name'];
|
||||
$title_nb = '';
|
||||
if (is_numeric( $page['cat'] ))
|
||||
{
|
||||
$title_img = replace_space(get_cat_display_name($page['cat_name']));
|
||||
$n = $page['current_rank'] + 1;
|
||||
$title_nb = $n.'/'.$page['cat_nb_images'];
|
||||
}
|
||||
else if ( $page['cat'] == 'search' )
|
||||
{
|
||||
$title_img = replace_search( $title_img, $_GET['search'] );
|
||||
}
|
||||
$title_nb = ($page['current_rank'] + 1).'/'.$page['cat_nb_images'];
|
||||
|
||||
// calculation of width and height
|
||||
if (empty($picture['current']['width']))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue