Index: trunk/phase3/includes/DatabasePostgres.php |
— | — | @@ -1016,7 +1016,7 @@ |
1017 | 1017 | ."WHERE n.nspowner=r.oid AND n.nspname = '$eschema'"; |
1018 | 1018 | $res = $this->query( $SQL ); |
1019 | 1019 | if ( $res && $res->numRows() ) { |
1020 | | - $row = $res->fetchRow(); |
| 1020 | + $row = $res->fetchObject(); |
1021 | 1021 | $owner = $row->rolname; |
1022 | 1022 | } else { |
1023 | 1023 | $owner = false; |
— | — | @@ -1104,8 +1104,7 @@ |
1105 | 1105 | $tss = $this->addQuotes($wgDBts2schema); |
1106 | 1106 | $pgp = $this->addQuotes($wgDBport); |
1107 | 1107 | $dbn = $this->addQuotes($this->mDBname); |
1108 | | - $ctypeRow = $this->doQuery("SHOW lc_ctype")->fetchArray(); |
1109 | | - $ctype = $ctypeRow[0]; |
| 1108 | + $ctype = pg_fetch_result($this->doQuery("SHOW lc_ctype"),0,0); |
1110 | 1109 | |
1111 | 1110 | $SQL = "UPDATE mediawiki_version SET mw_version=$mwv, pg_version=$pgv, pg_user=$pgu, ". |
1112 | 1111 | "mw_schema = $mws, ts2_schema = $tss, pg_port=$pgp, pg_dbname=$dbn, ". |