Changeset 7700 for extensions/AMetaData/amd_pip.class.inc.php

Timestamp:

Nov 8, 2010, 11:43:26 AM (14 years ago)

Author:

grum

Message:

fix bug:2019 - Personnal metadata are not correct
fix bug:2020 - Impossible to install plugin id it_IT language is activated

File:

• extensions/AMetaData/amd_pip.class.inc.php (modified) (3 diffs)

extensions/AMetaData/amd_pip.class.inc.php

@@ -113 +113 @@
       'values' => array(),
     );
-    $sql="SELECT st.tagId, gn.name as gName, ut.numId, ut.name
+    $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus
           FROM ((".$this->tables['selected_tags']." st
             LEFT JOIN ".$this->tables['groups']." gr
@@ -123 +123 @@
           WHERE gn.lang='".$user['language']."'
             AND st.groupId <> -1
-          ORDER BY gr.order, st.order;";
+          ORDER BY gr.order, st.order)
+
+          UNION
+
+          (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n'
+          FROM ((".$this->tables['selected_tags']." st2
+            LEFT JOIN ".$this->tables['used_tags']." ut2 ON ut2.tagId = st2.tagId)
+            LEFT JOIN ".$this->tables['user_tags_def']." pautd ON pautd.numId=ut2.numId)
+            LEFT JOIN ".$this->tables['used_tags']." ut3 ON ut3.numId = pautd.value
+          WHERE st2.tagId LIKE 'userDefined.%'
+          AND pautd.type = 'M');";
+
     $result=pwg_query($sql);
     if($result)
@@ -172 +183 @@
     foreach($tagsList as $key => $tagProperties)
     {
-      $keyExist=array_key_exists($key, $picturesTags);
+      $keyExist=array_key_exists($key, $picturesTags) & ($tagProperties['displayStatus']=='y');
       $userDefined=preg_match('/^userDefined\./i', $key);