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 "Show a warning in edit preview when a template loop is detected"
[lhc/web/wiklou.git]
/
includes
/
upload
/
UploadStash.php
diff --git
a/includes/upload/UploadStash.php
b/includes/upload/UploadStash.php
index
b7160b3
..
755f9fd
100644
(file)
--- a/
includes/upload/UploadStash.php
+++ b/
includes/upload/UploadStash.php
@@
-290,7
+290,6
@@
class UploadStash {
}
$this->fileMetadata[$key] = [
}
$this->fileMetadata[$key] = [
- 'us_id' => $dbw->nextSequenceValue( 'uploadstash_us_id_seq' ),
'us_user' => $this->userId,
'us_key' => $key,
'us_orig_path' => $path,
'us_user' => $this->userId,
'us_key' => $key,
'us_orig_path' => $path,
@@
-432,7
+431,7
@@
class UploadStash {
. ' No user is logged in, files must belong to users' );
}
. ' No user is logged in, files must belong to users' );
}
- $dbr = $this->repo->get
Slave
DB();
+ $dbr = $this->repo->get
Replica
DB();
$res = $dbr->select(
'uploadstash',
'us_key',
$res = $dbr->select(
'uploadstash',
'us_key',
@@
-511,7
+510,7
@@
class UploadStash {
// sometimes reading from the master is necessary, if there's replication lag.
$dbr = $this->repo->getMasterDB();
} else {
// sometimes reading from the master is necessary, if there's replication lag.
$dbr = $this->repo->getMasterDB();
} else {
- $dbr = $this->repo->get
Slave
DB();
+ $dbr = $this->repo->get
Replica
DB();
}
$row = $dbr->selectRow(
}
$row = $dbr->selectRow(