http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72234
Revision: 72234
Author: reedy
Date: 2010-09-02 21:54:53 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
Fixup some method calls with missing parameters
Modified Paths:
--------------
trunk/phase3/includes/db/DatabasePostgres.php
trunk/phase3/includes/specials/SpecialUserlogin.php
trunk/phase3/maintenance/FiveUpgrade.inc
trunk/phase3/maintenance/orphans.php
Modified: trunk/phase3/includes/db/DatabasePostgres.php
===================================================================
--- trunk/phase3/includes/db/DatabasePostgres.php 2010-09-02 21:43:04 UTC
(rev 72233)
+++ trunk/phase3/includes/db/DatabasePostgres.php 2010-09-02 21:54:53 UTC
(rev 72234)
@@ -137,7 +137,7 @@
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 @@
}
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 @@
}
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 @@
} else if ($s instanceof Blob) {
return "'".$s->fetch($s)."'";
}
- return "'" . pg_escape_string($s) . "'";
+ return "'" . pg_escape_string( null, $s ) . "'";
}
function quote_ident( $s ) {
Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2010-09-02 21:43:04 UTC
(rev 72233)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2010-09-02 21:54:53 UTC
(rev 72234)
@@ -892,7 +892,7 @@
}
/** */
- function userNotPrivilegedMessage($errors) {
+ function userNotPrivilegedMessage( $errors ) {
global $wgOut;
$wgOut->setPageTitle( wfMsg( 'permissionserrors' ) );
Modified: trunk/phase3/maintenance/FiveUpgrade.inc
===================================================================
--- trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-02 21:43:04 UTC (rev
72233)
+++ trunk/phase3/maintenance/FiveUpgrade.inc 2010-09-02 21:54:53 UTC (rev
72234)
@@ -732,7 +732,7 @@
$info['width'] = $image->getWidth();
$info['height'] = $image->getHeight();
- $gis = $image->getImageSize();
+ $gis = $image->getImageSize( $filename );
if ( isset( $gis['bits'] ) ) {
$info['bits'] = $gis['bits'];
}
Modified: trunk/phase3/maintenance/orphans.php
===================================================================
--- trunk/phase3/maintenance/orphans.php 2010-09-02 21:43:04 UTC (rev
72233)
+++ trunk/phase3/maintenance/orphans.php 2010-09-02 21:54:53 UTC (rev
72234)
@@ -106,7 +106,7 @@
}
if ( $fix ) {
- $dbw->unlockTables();
+ $dbw->unlockTables( __METHOD__ );
}
}
@@ -153,7 +153,7 @@
}
if ( $fix ) {
- $dbw->unlockTables();
+ $dbw->unlockTables( __METHOD__ );
}
}
@@ -226,7 +226,7 @@
}
if ( $fix ) {
- $dbw->unlockTables();
+ $dbw->unlockTables( __METHOD__ );
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
