Changeset 12224 for extensions/AMetaData/amd_pip.class.inc.php
- Timestamp:
- Sep 25, 2011, 4:58:39 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/AMetaData/amd_pip.class.inc.php
r7700 r12224 113 113 'values' => array(), 114 114 ); 115 $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus 115 $sql="(SELECT st.tagId, gn.name as gName, ut.numId, ut.name, 'y' AS displayStatus, st.order AS tOrder, gr.order as gOrder 116 116 FROM ((".$this->tables['selected_tags']." st 117 117 LEFT JOIN ".$this->tables['groups']." gr … … 122 122 ON ut.tagId = st.tagId 123 123 WHERE gn.lang='".$user['language']."' 124 AND st.groupId <> -1 125 ORDER BY gr.order, st.order) 124 AND st.groupId <> -1) 126 125 127 126 UNION 128 127 129 (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n' 128 (SELECT DISTINCT ut3.tagId, '', pautd.value, '', 'n', -1, -1 130 129 FROM ((".$this->tables['selected_tags']." st2 131 130 LEFT JOIN ".$this->tables['used_tags']." ut2 ON ut2.tagId = st2.tagId) … … 133 132 LEFT JOIN ".$this->tables['used_tags']." ut3 ON ut3.numId = pautd.value 134 133 WHERE st2.tagId LIKE 'userDefined.%' 135 AND pautd.type = 'M');"; 134 AND pautd.type = 'M') 135 136 ORDER BY gOrder, tOrder;"; 136 137 137 138 $result=pwg_query($sql);
Note: See TracChangeset
for help on using the changeset viewer.