mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-10 02:16:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from branch-1_7 (r2432).

Browse source 
Add triggers for category name (render_category_name).
Add  strip_tags for ALT attribute on category thumbnail.

git-svn-id: http://piwigo.org/svn/trunk@2433 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2008-07-12 14:57:24 +00:00
parent 2c08827ea0
commit b7709eae0d
4 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
admin/cat_list.php
View file

@ -212,7 +212,12 @@ foreach ($categories as $category)
$tpl_cat = $tpl_cat =
array( array(
'NAME' => $category['name'], 'NAME' =>
trigger_event(
'render_category_name',
$category['name'],
'admin_cat_list'
),
'ID' => $category['id'], 'ID' => $category['id'],
'RANK' => $category['rank']*10, 'RANK' => $category['rank']*10,

8
include/category_cats.inc.php
View file

@ -224,6 +224,12 @@ if (count($categories) > 0)
foreach ($categories as $category) foreach ($categories as $category)
{ {
$category['name'] = trigger_event(
'render_category_name',
$category['name'],
'subcatify_category_name'
);
if ($page['section']=='recent_cats') if ($page['section']=='recent_cats')
{ {
$name = get_cat_display_name_cache($category['uppercats'], null, false); $name = get_cat_display_name_cache($category['uppercats'], null, false);
@ -239,7 +245,7 @@ if (count($categories) > 0)
array( array(
'ID' => $category['id'], 'ID' => $category['id'],
'TN_SRC' => $thumbnail_src_of[$category['representative_picture_id']], 'TN_SRC' => $thumbnail_src_of[$category['representative_picture_id']],
'ALT' => $category['name'], 'ALT' => strip_tags($category['name']),
'ICON' => $icon_ts, 'ICON' => $icon_ts,
'URL' => make_index_url( 'URL' => make_index_url(

9
include/functions_category.inc.php
View file

@ -288,7 +288,14 @@ function display_select_categories($categories,
{ {
$option = str_repeat(' ', $option = str_repeat(' ',
(3 * substr_count($category['global_rank'], '.'))); (3 * substr_count($category['global_rank'], '.')));
$option.= '- '.$category['name']; $option.= '- ';
$option.= strip_tags(
trigger_event(
'render_category_name',
$category['name'],
'display_select_categories'
)
);
} }
$tpl_cats[ $category['id'] ] = $option; $tpl_cats[ $category['id'] ] = $option;
} }

21
include/functions_html.inc.php
View file

@ -246,6 +246,13 @@ function get_cat_display_name($cat_informations,
is_array($cat) or trigger_error( is_array($cat) or trigger_error(
'get_cat_display_name wrong type for category ', E_USER_WARNING 'get_cat_display_name wrong type for category ', E_USER_WARNING
); );
$cat['name'] = trigger_event(
'render_category_name',
$cat['name'],
'get_cat_display_name'
);
if ($is_first) if ($is_first)
{ {
$is_first = false; $is_first = false;
@ -320,6 +327,12 @@ SELECT id, name, permalink
{ {
$cat = $cache['cat_names'][$category_id]; $cat = $cache['cat_names'][$category_id];
$cat['name'] = trigger_event(
'render_category_name',
$cat['name'],
'get_cat_display_name_cache'
);
if ($is_first) if ($is_first)
{ {
$is_first = false; $is_first = false;
@ -430,7 +443,13 @@ function get_html_menu_category($categories, $selected_category)
{ {
$menu.= ' rel="up"'; $menu.= ' rel="up"';
} }
$menu.= ' title="'.$title.'">'.$category['name'].'</a>'; $menu.= ' title="'.$title.'">';
$menu.= trigger_event(
'render_category_name',
$category['name'],
'get_html_menu_category'
);
$menu.= '</a>';
if ( $category['count_images']>0 ) if ( $category['count_images']>0 )
{// at least one direct or indirect image {// at least one direct or indirect image