summaryrefslogtreecommitdiff
path: root/maintenance
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:30:47 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-05-01 15:30:47 -0400
commit7e85254903c7c0cb49e381f16b18441ea7b058cc (patch)
treeb22328fcf4c8408fc25a7acb73d1cb1089cd82ac /maintenance
parent1de335ad3f395ca6861085393ba366a9e3fb4a0d (diff)
parent1a365e77dfb8825136626202b1df462731b42060 (diff)
Merge commit '1a365e'
Diffstat (limited to 'maintenance')
-rw-r--r--maintenance/Maintenance.php2
-rw-r--r--maintenance/dictionary/mediawiki.dic1
2 files changed, 1 insertions, 2 deletions
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 923c5b41..5dafdfc0 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1097,7 +1097,7 @@ abstract class Maintenance {
*/
private function lockSearchindex( $db ) {
$write = array( 'searchindex' );
- $read = array( 'page', 'revision', 'text', 'interwiki', 'l10n_cache', 'user' );
+ $read = array( 'page', 'revision', 'text', 'interwiki', 'l10n_cache', 'user', 'page_restrictions' );
$db->lockTables( $read, $write, __CLASS__ . '::' . __METHOD__ );
}
diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic
index dd27c8ca..ad19a1ce 100644
--- a/maintenance/dictionary/mediawiki.dic
+++ b/maintenance/dictionary/mediawiki.dic
@@ -3158,7 +3158,6 @@ pnmtopng
pointsize
poolcounter
popts
-popularpages
portlet
portlets
posplus