Browse Source

Merge pull request #760 from NicoDucou/1.10.x.forge

Fixing getShortSessionListAndExtraByCategory to return all the extrafields needed - refs BT9907
Yannick Warnier 9 years ago
parent
commit
dbddfbf1b1
1 changed files with 3 additions and 2 deletions
  1. 3 2
      main/inc/lib/sessionmanager.lib.php

+ 3 - 2
main/inc/lib/sessionmanager.lib.php

@@ -5750,12 +5750,13 @@ class SessionManager
             }
             // Get session field values
             $extra = new ExtraFieldValue('session');
-            $sessionFieldValueList = $extra->get_all(array('field_id IN ( ' . $questionMarks . ' )' => array_keys($fields)));
+            $questionMarksFields = substr(str_repeat('?, ', count($fields)), 0, -2);
+            $sessionFieldValueList = $extra->get_all(array ('where' => array('field_id IN ( ' . $questionMarksFields . ' )' => array_keys($fields))));
             // Add session fields values to session list
             foreach ($sessionList as $id => &$session) {
                 foreach ($sessionFieldValueList as $sessionFieldValue) {
                     // Match session field values to session
-                    if ($sessionFieldValue['session_id'] == $id) {
+                    if ($sessionFieldValue['item_id'] == $id) {
                         // Check if session field value is set in session field list
                         if (isset($fields[$sessionFieldValue['field_id']])) {
                             // Avoid overwriting the session's ID field