projects
/
fusionforge
/
fusionforge.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
project home
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0c8848
)
Merged from Evolvis: Mediawiki: wrap DatabasePostgres::open() and append public to...
author
Roland Mas
<lolando@debian.org>
Thu, 14 Jun 2012 14:24:29 +0000
(14:24 +0000)
committer
Roland Mas
<lolando@debian.org>
Thu, 14 Jun 2012 14:24:29 +0000
(14:24 +0000)
src/plugins/mediawiki/www/LocalSettings.php
patch
|
blob
|
history
diff --git
a/src/plugins/mediawiki/www/LocalSettings.php
b/src/plugins/mediawiki/www/LocalSettings.php
index a871cbe52fac9e25308863aa17e34192b5c1ea48..38599f2dedffdf2b4d51281b49502d11e8e96e96 100644
(file)
--- a/
src/plugins/mediawiki/www/LocalSettings.php
+++ b/
src/plugins/mediawiki/www/LocalSettings.php
@@
-86,6
+86,18
@@
class DatabaseForge extends DatabasePostgres {
$password, $dbName, $failFunction, $flags);
}
$password, $dbName, $failFunction, $flags);
}
+ function open($server, $user, $password, $dbName) {
+ $v = DatabasePostgres::open($server, $user, $password, $dbName);
+
+ global $wgDBmwschema;
+ if ($this->schemaExists($wgDBmwschema)) {
+ $safeschema = $this->addIdentifierQuotes($wgDBmwschema);
+ $this->doQuery("SET search_path TO $safeschema,public");
+ }
+
+ return $v;
+ }
+
function tableName($name, $format='quoted') {
switch ($name) {
case 'interwiki':
function tableName($name, $format='quoted') {
switch ($name) {
case 'interwiki':