Changeset 26922 for trunk/admin

Timestamp:

Jan 23, 2014, 2:05:19 PM (11 years ago)

Author:

plg

Message:

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)

File:

• trunk/admin/include/functions.php (modified) (2 diffs)

trunk/admin/include/functions.php

@@ -1427 +1427 @@
  * @return int
  */
-function tag_id_from_tag_name($tag_name, $create=true)
+function tag_id_from_tag_name($tag_name)
 {
   global $page;
@@ -1473 +1473 @@
           );
 
+        $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];
       }