| Index: trunk/phase3/maintenance/orphans.php |
| — | — | @@ -106,7 +106,7 @@ |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | if ( $fix ) { |
| 110 | | - $dbw->unlockTables(); |
| | 110 | + $dbw->unlockTables( __METHOD__ ); |
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | if ( $fix ) { |
| 157 | | - $dbw->unlockTables(); |
| | 157 | + $dbw->unlockTables( __METHOD__ ); |
| 158 | 158 | } |
| 159 | 159 | } |
| 160 | 160 | |
| — | — | @@ -226,7 +226,7 @@ |
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | if ( $fix ) { |
| 230 | | - $dbw->unlockTables(); |
| | 230 | + $dbw->unlockTables( __METHOD__ ); |
| 231 | 231 | } |
| 232 | 232 | } |
| 233 | 233 | } |
| Index: trunk/phase3/maintenance/FiveUpgrade.inc |
| — | — | @@ -732,7 +732,7 @@ |
| 733 | 733 | $info['width'] = $image->getWidth(); |
| 734 | 734 | $info['height'] = $image->getHeight(); |
| 735 | 735 | |
| 736 | | - $gis = $image->getImageSize(); |
| | 736 | + $gis = $image->getImageSize( $filename ); |
| 737 | 737 | if ( isset( $gis['bits'] ) ) { |
| 738 | 738 | $info['bits'] = $gis['bits']; |
| 739 | 739 | } |
| Index: trunk/phase3/includes/db/DatabasePostgres.php |
| — | — | @@ -137,7 +137,7 @@ |
| 138 | 138 | |
| 139 | 139 | function hasConstraint( $name ) { |
| 140 | 140 | global $wgDBmwschema; |
| 141 | | - $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) ."'"; |
| | 141 | + $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 ) ."'"; |
| 142 | 142 | return $this->numRows($res = $this->doQuery($SQL)); |
| 143 | 143 | } |
| 144 | 144 | |
| — | — | @@ -1339,7 +1339,7 @@ |
| 1340 | 1340 | } |
| 1341 | 1341 | |
| 1342 | 1342 | function encodeBlob( $b ) { |
| 1343 | | - return new Blob ( pg_escape_bytea( $b ) ) ; |
| | 1343 | + return new Blob ( pg_escape_bytea( null, $b ) ) ; |
| 1344 | 1344 | } |
| 1345 | 1345 | |
| 1346 | 1346 | function decodeBlob( $b ) { |
| — | — | @@ -1350,7 +1350,7 @@ |
| 1351 | 1351 | } |
| 1352 | 1352 | |
| 1353 | 1353 | function strencode( $s ) { ## Should not be called by us |
| 1354 | | - return pg_escape_string( $s ); |
| | 1354 | + return pg_escape_string( null, $s ); |
| 1355 | 1355 | } |
| 1356 | 1356 | |
| 1357 | 1357 | function addQuotes( $s ) { |
| — | — | @@ -1361,7 +1361,7 @@ |
| 1362 | 1362 | } else if ($s instanceof Blob) { |
| 1363 | 1363 | return "'".$s->fetch($s)."'"; |
| 1364 | 1364 | } |
| 1365 | | - return "'" . pg_escape_string($s) . "'"; |
| | 1365 | + return "'" . pg_escape_string( null, $s ) . "'"; |
| 1366 | 1366 | } |
| 1367 | 1367 | |
| 1368 | 1368 | function quote_ident( $s ) { |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -892,7 +892,7 @@ |
| 893 | 893 | } |
| 894 | 894 | |
| 895 | 895 | /** */ |
| 896 | | - function userNotPrivilegedMessage($errors) { |
| | 896 | + function userNotPrivilegedMessage( $errors ) { |
| 897 | 897 | global $wgOut; |
| 898 | 898 | |
| 899 | 899 | $wgOut->setPageTitle( wfMsg( 'permissionserrors' ) ); |