Changeset 1291


Ignore:
Timestamp:
Apr 29, 2006, 12:36:49 PM (18 years ago)
Author:
chrisaga
Message:
  • merge trunk r1289:1290 into branch 1.6 (bug 358 fixed)
Location:
branches/branch-1_6/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1_6/include/category_subcats.inc.php

    r1273 r1291  
    150150        array(
    151151          'SRC'   => $thumbnail_src_of[ $category['picture'] ],
    152           'ALT'   => htmlentities($category['name'],ENT_QUOTES),
     152          'ALT'   => $category['name'],
    153153          'TITLE' => $lang['hint_category'],
    154154          'ICON'  => get_icon(@$category['date_last']),
    … …  
    160160              )
    161161            ),
    162           'NAME' => htmlentities($category['name'],ENT_QUOTES),
     162          'NAME' => $category['name'],
    163163          'CAPTION_NB_IMAGES' => (($category['nb_images'] == 0) ? '' : sprintf("%d ".l10n('pictures'), $category['nb_images'])),
    164164          'DESCRIPTION' => @$category['comment'],

  • branches/branch-1_6/include/functions.inc.php

    r1282 r1291  
    800800 * @return string
    801801 */
    802 function raw_l10n($key)
     802function l10n($key)
    803803{
    804804  global $lang, $conf;
    … …  
    810810
    811811  return isset($lang[$key]) ? $lang[$key] : $key;
    812 }
    813 /**
    814  * Like l10n but converts html entities
    815  *
    816  * @param string key
    817  * @return string
    818  */
    819 function l10n($key)
    820 {
    821   return htmlentities(raw_l10n($key),ENT_QUOTES);
    822812}
    823813

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

    r1287 r1291  
    451451      $menu.= ' rel="up"';
    452452    }
    453     $menu.= '>'.htmlentities($category['name'],ENT_QUOTES).'</a>';
     453    $menu.= '>'.$category['name'].'</a>';
    454454
    455455    if ($category['nb_images'] > 0)
    … …  
    551551    $output.=
    552552      ' />'
    553       .' '. htmlentities($tag['name'],ENT_QUOTES)
     553      .' '. $tag['name']
    554554      .'</label>'
    555555      .'</li>'

  • branches/branch-1_6/include/page_header.php

    r1157 r1291  
    6969}
    7070
     71header('Content-Type: text/html; charset='.$lang_info['charset']);
    7172$template->parse('header');
    7273?>
Note: See TracChangeset for help on using the changeset viewer.