adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge r12553 from trunk to branch 2.3

Browse Source 
feature:2322
feature:2493
Add a trigger for multi language tags in quick search and url

git-svn-id: http://piwigo.org/svn/branches/2.3@12555 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-11-05 16:34:26 +00:00
parent ff8e5dc9e3
commit 7343f339bd
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions.php
+2 -2
View File
@@ -1450,7 +1450,7 @@ SELECT id
array( array(
array( array(
'name' => $tag_name, 'name' => $tag_name,
'url_name' => str2url($tag_name), 'url_name' => trigger_event('render_tag_url', $tag_name),
) )
) )
); );
@@ -1725,7 +1725,7 @@ SELECT id
array( array(
array( array(
'name' => $tag_name, 'name' => $tag_name,
'url_name' => str2url($tag_name), 'url_name' => trigger_event('render_tag_url', $tag_name),
) )
) )
); );
admin/tags.php
+2 -2
View File
@@ -84,7 +84,7 @@ SELECT id, name
array( array(
'id' => $tag_id, 'id' => $tag_id,
'name' => addslashes($tag_name), 'name' => addslashes($tag_name),
'url_name' => str2url(trigger_event('render_tag_url', $tag_name)), 'url_name' => trigger_event('render_tag_url', $tag_name),
) )
); );
} }
@@ -264,7 +264,7 @@ SELECT id
array( array(
array( array(
'name' => $tag_name, 'name' => $tag_name,
'url_name' => str2url(trigger_event('render_tag_url', $tag_name)), 'url_name' => trigger_event('render_tag_url', $tag_name),
) )
) )
); );
include/common.inc.php
+1
View File
@@ -278,6 +278,7 @@ if ( !$conf['allow_html_descriptions'] )
} }
add_event_handler('render_comment_content', 'render_comment_content'); add_event_handler('render_comment_content', 'render_comment_content');
add_event_handler('render_comment_author', 'strip_tags'); add_event_handler('render_comment_author', 'strip_tags');
add_event_handler('render_tag_url', 'str2url');
add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1); add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1);
trigger_action('init'); trigger_action('init');
?> ?>
index.php
+1 -1
View File
@@ -214,7 +214,7 @@ if ( $page['section']=='search' and $page['start']==0 and
{ {
$hints[] = $hints[] =
'<a href="' . make_index_url(array('tags'=>array($tag))) . '">' '<a href="' . make_index_url(array('tags'=>array($tag))) . '">'
.$tag['name'] .trigger_event('render_tag_name', $tag['name'])
.'</a>'; .'</a>';
} }
$template->assign( 'tag_search_results', $hints); $template->assign( 'tag_search_results', $hints);