diff --git a/core/trunk/core/class/class_request.php b/core/trunk/core/class/class_request.php
index e41c89440dacdacebd5619fbc1c7f1941ce85472..137e8fd40920f9824dbd094696d6cd31dfb5edf3 100644
--- a/core/trunk/core/class/class_request.php
+++ b/core/trunk/core/class/class_request.php
@@ -459,7 +459,6 @@ class request extends dbquery
                     $update_string .= $data[$i]['column']."=?,";
                     $parameters[] = $data[$i]['value']; 
                 }
-                
             }
         }
         $update_string = substr($update_string, 0, -1);
diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index 94867fbb6fc0a149eb7f56b53d5582cb1b5aa126..55b1d5a4a18787ac13476f59491abfa2c569cf6f 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -143,13 +143,12 @@ class security extends dbquery
                     ) {
                         $_SESSION['user']['signature_path'] = $user->__get('signature_path');
                         $_SESSION['user']['signature_file_name'] = $user->__get('signature_file_name');
-                        $db = new dbquery();
-                        $db->connect();
+                        $db = new Database();
                         $query = "select path_template from " 
                             . _DOCSERVERS_TABLE_NAME 
                             . " where docserver_id = 'TEMPLATES'";
-                        $db->query($query);
-                        $resDs = $db->fetch_object();
+                        $stmt = $db->query($query);
+                        $resDs = $stmt->fetchObject();
                         $pathToDs = $resDs->path_template;
                         $_SESSION['user']['pathToSignature'] = $pathToDs . str_replace(
                                 "#",