merge r26921 from branch 2.6 to trunk

bug 3032 fixed: it seems that the SQL update in invalidate_user_cache_nb_tags corrupts the pwg_db_insert_id (very unexpected)


git-svn-id: http://piwigo.org/svn/trunk@26922 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2014-01-23 13:05:19 +00:00
parent 18eb56efd5
commit 788e9eef64
+3 -2
View File
@@ -1426,7 +1426,7 @@ DELETE
* @param string $tag_name
* @return int
*/
function tag_id_from_tag_name($tag_name, $create=true)
function tag_id_from_tag_name($tag_name)
{
global $page;
@@ -1472,9 +1472,10 @@ SELECT id
)
);
$page['tag_id_from_tag_name_cache'][$tag_name] = pwg_db_insert_id(TAGS_TABLE);
invalidate_user_cache_nb_tags();
$page['tag_id_from_tag_name_cache'][$tag_name] = pwg_db_insert_id(TAGS_TABLE);
return $page['tag_id_from_tag_name_cache'][$tag_name];
}
}