diff --git a/include/class.plugin.php b/include/class.plugin.php
index d553e5e224c0c018fafda2f4e2a10f0844f9bff3..a6b653697e1b8ac5e3d60cc7ee96d8e5e59ad43b 100644
--- a/include/class.plugin.php
+++ b/include/class.plugin.php
@@ -68,6 +68,8 @@ class PluginConfig extends Config {
     }
 
     function commitForm(&$errors=array()) {
+        global $msg;
+
         $f = $this->getForm();
         $commit = false;
         if ($f->isValid()) {
diff --git a/include/class.search.php b/include/class.search.php
index 1beeb2d5c26fa7b1e3aeba5dc4ed0bb2d29475df..c6449156beb5ba81cafda134f9c7dac0f87d6a56 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -296,6 +296,7 @@ class MysqlSearchBackend extends SearchBackend {
             $key = 'COALESCE(B1.ticket_id, B2.ticket_id, B3.ticket_id, B4.ticket_id)';
             $tables[] = "{$P}ticket A1 ON (A1.ticket_id = {$key})";
             $cdata_search = false;
+            $where = array();
 
             if ($criteria) {
                 foreach ($criteria as $name=>$value) {
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index c13e78121be2f710b82a84d2e54d4e28e63b6ec3..5e3904e62d1ba00ccf14b1537d851bb8a81f6d6c 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -10,6 +10,7 @@ class mysqli {
     function real_connect() {}
     function select_db() {}
     function set_charset() {}
+    function autocommit() {}
 }
 
 class mysqli_stmt {
@@ -113,4 +114,12 @@ class finfo {
 class Locale {
     function getDisplayName() {}
 }
+class IntlBreakIterator {
+    static function createWordInstance() {}
+    function setText() {}
+}
+
+class SqlFunction {
+    static function NOW() {}
+}
 ?>