From 66a28589b18e43009318c60973181b659e4ce715 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 2 Sep 2010 21:54:53 +0000
Subject: [PATCH] Fixup some method calls with missing parameters

---
 includes/db/DatabasePostgres.php       | 8 ++++----
 includes/specials/SpecialUserlogin.php | 2 +-
 maintenance/FiveUpgrade.inc            | 2 +-
 maintenance/orphans.php                | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 88535e73d4..7a3929b554 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -137,7 +137,7 @@ class DatabasePostgres extends DatabaseBase {
 
 	function hasConstraint( $name ) {
 		global $wgDBmwschema;
-		$SQL = "SELECT 1 FROM pg_catalog.pg_constraint c, pg_catalog.pg_namespace n WHERE c.connamespace = n.oid AND conname = '" . pg_escape_string( $name ) . "' AND n.nspname = '" . pg_escape_string($wgDBmwschema) ."'";
+		$SQL = "SELECT 1 FROM pg_catalog.pg_constraint c, pg_catalog.pg_namespace n WHERE c.connamespace = n.oid AND conname = '" . pg_escape_string( null, $name ) . "' AND n.nspname = '" . pg_escape_string( null, $wgDBmwschema ) ."'";
 		return $this->numRows($res = $this->doQuery($SQL));
 	}
 
@@ -1339,7 +1339,7 @@ SQL;
 	}
 
 	function encodeBlob( $b ) {
-		return new Blob ( pg_escape_bytea( $b ) ) ;
+		return new Blob ( pg_escape_bytea( null, $b ) ) ;
 	}
 
 	function decodeBlob( $b ) {
@@ -1350,7 +1350,7 @@ SQL;
 	}
 
 	function strencode( $s ) { ## Should not be called by us
-		return pg_escape_string( $s );
+		return pg_escape_string( null, $s );
 	}
 
 	function addQuotes( $s ) {
@@ -1361,7 +1361,7 @@ SQL;
 		} else if ($s instanceof Blob) {
 			return "'".$s->fetch($s)."'";
 		}
-		return "'" . pg_escape_string($s) . "'";
+		return "'" . pg_escape_string( null, $s ) . "'";
 	}
 
 	function quote_ident( $s ) {
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 5e5f6a6864..2c90ae15dd 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -892,7 +892,7 @@ class LoginForm {
 	}
 
 	/** */
-	function userNotPrivilegedMessage($errors) {
+	function userNotPrivilegedMessage( $errors ) {
 		global $wgOut;
 
 		$wgOut->setPageTitle( wfMsg( 'permissionserrors' ) );
diff --git a/maintenance/FiveUpgrade.inc b/maintenance/FiveUpgrade.inc
index fd4bb86207..5eebb0e881 100644
--- a/maintenance/FiveUpgrade.inc
+++ b/maintenance/FiveUpgrade.inc
@@ -732,7 +732,7 @@ END;
 		$info['width'] = $image->getWidth();
 		$info['height'] = $image->getHeight();
 
-		$gis = $image->getImageSize();
+		$gis = $image->getImageSize( $filename );
 		if ( isset( $gis['bits'] ) ) {
 			$info['bits'] = $gis['bits'];
 		}
diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index a82fa407bb..df4ba36057 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -106,7 +106,7 @@ class Orphans extends Maintenance {
 		}
 	
 		if ( $fix ) {
-			$dbw->unlockTables();
+			$dbw->unlockTables( __METHOD__ );
 		}
 	}
 
@@ -153,7 +153,7 @@ class Orphans extends Maintenance {
 		}
 	
 		if ( $fix ) {
-			$dbw->unlockTables();
+			$dbw->unlockTables( __METHOD__ );
 		}
 	}
 
@@ -226,7 +226,7 @@ class Orphans extends Maintenance {
 		}
 	
 		if ( $fix ) {
-			$dbw->unlockTables();
+			$dbw->unlockTables( __METHOD__ );
 		}
 	}
 }
-- 
2.20.1