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 "registration: Don't let extensions load late"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialWatchlist.php
diff --git
a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index
17d77ba
..
4824961
100644
(file)
--- a/
includes/specials/SpecialWatchlist.php
+++ b/
includes/specials/SpecialWatchlist.php
@@
-313,7
+313,7
@@
class SpecialWatchlist extends ChangesListSpecialPage {
* @return IDatabase
*/
protected function getDB() {
* @return IDatabase
*/
protected function getDB() {
- return wfGetDB( DB_
SLAVE
, 'watchlist' );
+ return wfGetDB( DB_
REPLICA
, 'watchlist' );
}
/**
}
/**
@@
-343,7
+343,7
@@
class SpecialWatchlist extends ChangesListSpecialPage {
$user = $this->getUser();
$output = $this->getOutput();
$user = $this->getUser();
$output = $this->getOutput();
- # Show a message about
slave
lag, if applicable
+ # Show a message about
replica DB
lag, if applicable
$lag = wfGetLB()->safeGetLag( $dbr );
if ( $lag > 0 ) {
$output->showLagWarning( $lag );
$lag = wfGetLB()->safeGetLag( $dbr );
if ( $lag > 0 ) {
$output->showLagWarning( $lag );
@@
-618,9
+618,10
@@
class SpecialWatchlist extends ChangesListSpecialPage {
$form .= Xml::openElement( 'form', [
'method' => 'get',
$form .= Xml::openElement( 'form', [
'method' => 'get',
- 'action' =>
$this->getPageTitle()->getLocalURL
(),
+ 'action' =>
wfScript
(),
'id' => 'mw-watchlist-form'
] );
'id' => 'mw-watchlist-form'
] );
+ $form .= Html::hidden( 'title', $this->getPageTitle()->getPrefixedText() );
$form .= Xml::fieldset(
$this->msg( 'watchlist-options' )->text(),
false,
$form .= Xml::fieldset(
$this->msg( 'watchlist-options' )->text(),
false,