dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Return null from EditPage::importContentFormData"
[lhc/web/wiklou.git]
/
maintenance
/
includes
/
TextPassDumper.php
diff --git
a/maintenance/includes/TextPassDumper.php
b/maintenance/includes/TextPassDumper.php
index
c6738bc
..
04767fa
100644
(file)
--- a/
maintenance/includes/TextPassDumper.php
+++ b/
maintenance/includes/TextPassDumper.php
@@
-207,6
+207,7
@@
TEXT
* This function resets $this->lb and closes all connections on it.
*
* @throws MWException
* This function resets $this->lb and closes all connections on it.
*
* @throws MWException
+ * @suppress PhanTypeObjectUnsetDeclaredProperty
*/
function rotateDb() {
// Cleaning up old connections
*/
function rotateDb() {
// Cleaning up old connections
@@
-240,7
+241,7
@@
TEXT
}
try {
}
try {
- $this->db = $this->lb->get
Connection
( DB_REPLICA, 'dump' );
+ $this->db = $this->lb->get
MaintenanceConnectionRef
( DB_REPLICA, 'dump' );
} catch ( Exception $e ) {
throw new MWException( __METHOD__
. " rotating DB failed to obtain new database (" . $e->getMessage() . ")" );
} catch ( Exception $e ) {
throw new MWException( __METHOD__
. " rotating DB failed to obtain new database (" . $e->getMessage() . ")" );
@@
-759,6
+760,7
@@
TEXT
function openSpawn() {
global $IP;
function openSpawn() {
global $IP;
+ $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() );
if ( count( $this->php ) == 2 ) {
$mwscriptpath = $this->php[1];
} else {
if ( count( $this->php ) == 2 ) {
$mwscriptpath = $this->php[1];
} else {
@@
-771,14
+773,14
@@
TEXT
$this->php[0],
$mwscriptpath,
"fetchText.php",
$this->php[0],
$mwscriptpath,
"fetchText.php",
- '--wiki',
wfWikiID()
] ) );
+ '--wiki',
$wiki
] ) );
} else {
$cmd = implode( " ",
array_map( [ Shell::class, 'escape' ],
[
$this->php[0],
"$IP/maintenance/fetchText.php",
} else {
$cmd = implode( " ",
array_map( [ Shell::class, 'escape' ],
[
$this->php[0],
"$IP/maintenance/fetchText.php",
- '--wiki',
wfWikiID()
] ) );
+ '--wiki',
$wiki
] ) );
}
$spec = [
0 => [ "pipe", "r" ],
}
$spec = [
0 => [ "pipe", "r" ],