Merge "Remove screen layout references in passwordreset-email* messages"

[lhc/web/wiklou.git] / includes / db / DatabaseMssql.php

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index be5fac9..eb061d8 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -42,18 +42,6 @@ class DatabaseMssql extends DatabaseBase {
 
        protected $mPort;
 
-       public function cascadingDeletes() {
-               return true;
-       }
-
-       public function cleanupTriggers() {
-               return false;
-       }
-
-       public function strictIPs() {
-               return false;
-       }
-
        public function implicitGroupby() {
                return false;
        }
@@ -1097,8 +1085,8 @@ class DatabaseMssql extends DatabaseBase {
        }
 
        /**
-        * @param string|Blob $s
-        * @return string
+        * @param string|int|null|bool|Blob $s
+        * @return string|int
         */
        public function addQuotes( $s ) {
                if ( $s instanceof MssqlBlob ) {