Merge "Avoid calling awful DatabaseBase::strictIPs() method"

diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 590fd37..ac5824b 100644 (file)
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -297,7 +297,8 @@ class RecentChange {
                }
 
                # If our database is strict about IP addresses, use NULL instead of an empty string
-               if ( $dbw->strictIPs() && $this->mAttribs['rc_ip'] == '' ) {
+               $strictIPs = in_array( $dbw->getType(), [ 'oracle', 'postgres' ] ); // legacy
+               if ( $strictIPs && $this->mAttribs['rc_ip'] == '' ) {
                        unset( $this->mAttribs['rc_ip'] );
                }
 

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index be5fac9..2c6db10 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -50,7 +50,7 @@ class DatabaseMssql extends DatabaseBase {
                return false;
        }
 
-       public function strictIPs() {
+       public function realTimestamps() {
                return false;
        }