mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug 3101: Allow multi language tags to be recognized from selectize or metadata sync

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@29066 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2014-07-21 21:00:17 +00:00
parent ddbe02d7e0
commit 2eca26b97c
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
admin/include/functions.php
View file

@ -1553,23 +1553,29 @@ SELECT id
;'; ;';
if (count($existing_tags = query2array($query, null, 'id')) == 0) if (count($existing_tags = query2array($query, null, 'id')) == 0)
{ {
// search existing by case insensitive name $url_name = trigger_change('render_tag_url', $tag_name);
// search existing by url name
$query = ' $query = '
SELECT id
FROM '.TAGS_TABLE.'
WHERE CONVERT(name, CHAR) = \''.$tag_name.'\'
;';
if (count($existing_tags = query2array($query, null, 'id')) == 0)
{
$url_name = trigger_change('render_tag_url', $tag_name);
// search existing by url name
$query = '
SELECT id SELECT id
FROM '.TAGS_TABLE.' FROM '.TAGS_TABLE.'
WHERE url_name = \''.$url_name.'\' WHERE url_name = \''.$url_name.'\'
;'; ;';
if (count($existing_tags = query2array($query, null, 'id')) == 0) if (count($existing_tags = query2array($query, null, 'id')) == 0)
{
// search by extended description (plugin sub name)
$sub_name_where = trigger_change('get_tag_name_like_where', array(), $tag_name);
if (count($sub_name_where))
{ {
$query = '
SELECT id
FROM '.TAGS_TABLE.'
WHERE '.implode(' OR ', $sub_name_where).'
;';
$existing_tags = query2array($query, null, 'id');
}
if (count($existing_tags) == 0)
{// finally create the tag
mass_inserts( mass_inserts(
TAGS_TABLE, TAGS_TABLE,
array('name', 'url_name'), array('name', 'url_name'),

9
tools/triggers_list.php
View file

@ -227,10 +227,17 @@ array(
array( array(
'name' => 'get_tag_alt_names', 'name' => 'get_tag_alt_names',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('array', null, 'array', 'raw_name'), 'vars' => array('array', null, 'string', 'raw_name'),
'files' => array('admin\tags.php', 'admin\include\functions.php (get_taglist)'), 'files' => array('admin\tags.php', 'admin\include\functions.php (get_taglist)'),
'infos' => 'New in 2.4', 'infos' => 'New in 2.4',
), ),
array(
'name' => 'get_tag_name_like_where',
'type' => 'trigger_change',
'vars' => array('array', null, 'string', 'tag_name'),
'files' => array('admin\include\functions.php (tag_id_from_tag_name)'),
'infos' => 'New in 2.7',
),
array( array(
'name' => 'get_webmaster_mail_address', 'name' => 'get_webmaster_mail_address',
'type' => 'trigger_change', 'type' => 'trigger_change',