Merge branch 'db-placeholders'. #26

eventum · Feb 2, 2015 · 4c939cc · 4c939cc
2 parents e06d61d + 564d980
commit 4c939cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/eventum/class.notification.php b/lib/eventum/class.notification.php
@@ -1618,13 +1618,13 @@ public static function getSubscribers($issue_id, $type = null, $min_role = null)
                      WHERE
                         sub_id = sbt_sub_id AND
                         sub_iss_id=?";
-            $params[] = $issue_id;
+            $params = array($issue_id);
             if ($type) {
                 $stmt .= " AND\nsbt_type = ?";
                 $params[] = $type;
             }
             try {
-                $emails = DB_Helper::getInstance()->getAll($stmt, $type);
+                $emails = DB_Helper::getInstance()->getAll($stmt, $params);
             } catch (DbException $e) {
                 return array();
             }

diff --git a/lib/eventum/class.time_tracking.php b/lib/eventum/class.time_tracking.php
@@ -316,7 +316,7 @@ public static function getTimeSpentByIssues(&$result)
                  GROUP BY
                     ttr_iss_id";
         try {
-            $res = DB_Helper::getInstance()->fetchAssoc($stmt, false, $ids);
+            $res = DB_Helper::getInstance()->fetchAssoc($stmt, $ids);
         } catch (DbException $e) {
             return;
         }