diff options
| author | patdenice <patdenice@piwigo.org> | 2011-11-05 16:34:26 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-11-05 16:34:26 +0000 |
| commit | 7343f339bd583966276cd98e3717f64088cfb6ba (patch) | |
| tree | f332f58b681ea90e329686f5d239e668b109b3ca /admin | |
| parent | ff8e5dc9e3555adda12b829db6b2d02ba19d33dc (diff) | |
merge r12553 from trunk to branch 2.3
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
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/include/functions.php | 4 | ||||
| -rw-r--r-- | admin/tags.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 4a67b5202..3491e0c4e 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1450,7 +1450,7 @@ SELECT id array( array( '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( 'name' => $tag_name, - 'url_name' => str2url($tag_name), + 'url_name' => trigger_event('render_tag_url', $tag_name), ) ) ); diff --git a/admin/tags.php b/admin/tags.php index a879806fb..8783463c1 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -84,7 +84,7 @@ SELECT id, name array( 'id' => $tag_id, '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( 'name' => $tag_name, - 'url_name' => str2url(trigger_event('render_tag_url', $tag_name)), + 'url_name' => trigger_event('render_tag_url', $tag_name), ) ) ); |