Merge branch 'archwiki'

Conflicts:
	extensions/FluxBBAuthPlugin.php
	extensions/SyntaxHighlight_GeSHi/README
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.i18n.php
	extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.php
	extensions/SyntaxHighlight_GeSHi/geshi/docs/CHANGES
	extensions/SyntaxHighlight_GeSHi/geshi/docs/THANKS
	extensions/SyntaxHighlight_GeSHi/geshi/docs/TODO
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/AbstractPrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constant.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Constructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Destructor.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Function.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Global.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/I.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Index.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Interface_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/L.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Lplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Method.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Page_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateClass_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/PrivateVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticMethod.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/StaticVariable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/T.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tminus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Tplus.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/Variable.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/blank.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/class_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/file.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/function_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/next_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/package_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/previous_button_disabled.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/private_class_logo.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/tutorial_folder.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/api/media/images/up_button.png
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.html
	extensions/SyntaxHighlight_GeSHi/geshi/docs/geshi-doc.txt
	extensions/SyntaxHighlight_GeSHi/geshi/geshi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/4cs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502acme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502kickass.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/6502tasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/68000devpac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/abap.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/actionscript3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ada.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/algol68.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apache.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/applescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/apt_sources.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/asp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoconf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autohotkey.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/autoit.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/avisynth.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/awk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bascomavr.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bash.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/basic4gl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bibtex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/blitzbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/bnf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/boo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_loadrunner.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/c_mac.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/caddcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cadlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfdg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cfm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/chaiscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cil.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/clojure.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cmake.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cobol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/coffeescript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp-qt.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/csharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/css.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/cuesheet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/d.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dcs.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/delphi.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/diff.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/div.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dos.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/dot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/e.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ecmascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/eiffel.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/email.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/epc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/erlang.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/euphoria.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/f1.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/falcon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fo.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fortran.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/freebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/fsharp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gambas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gdb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genero.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/genie.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gettext.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/glsl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gnuplot.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/go.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/groovy.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/gwbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/haskell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hicest.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/hq9plus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html4strict.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/html5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/icon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/idl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ini.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/inno.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/intercal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/io.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/j.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/java5.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/javascript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/jquery.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/kixtart.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/klonecpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/latex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/llvm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/locobasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/logtalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lolcode.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusformulas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lotusscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lsl2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/lua.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/m68k.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/magiksf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/make.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mapbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/matlab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mirc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mmix.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/modula3.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mpasm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mxml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/mysql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/newlisp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/nsis.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oberon2.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objc.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/objeck.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ocaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oobas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle11.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oracle8.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oxygene.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/oz.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pascal.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pcre.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/per.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/perl6.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php-brief.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/php.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pic16.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pike.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pixelbender.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pli.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/plsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/postgresql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/povray.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powerbuilder.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/powershell.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/proftpd.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/progress.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/prolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/properties.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/providex.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/purebasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/pycon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/python.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/q.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/qbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rails.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rebol.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/reg.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/robots.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rpmspec.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/rsplus.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/ruby.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sas.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scheme.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/scilab.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sdlbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smalltalk.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/smarty.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/sql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/systemverilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tcl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/teraterm.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/text.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/thinbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/tsql.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/typoscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/unicon.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/uscript.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vala.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vb.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vbnet.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/verilog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vhdl.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/vim.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualfoxpro.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/visualprolog.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whitespace.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/whois.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/winbatch.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xbasic.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xorg_conf.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/xpp.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/yaml.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/z80.php
	extensions/SyntaxHighlight_GeSHi/geshi/geshi/zxbasic.php

1 files changed, 116 insertions, 53 deletions

diff --git a/includes/api/ApiQueryInfo.php b/includes/api/ApiQueryInfo.php
index 5d4f0346..017684ed 100644
--- a/includes/api/ApiQueryInfo.php
+++ b/includes/api/ApiQueryInfo.php
@@ -33,7 +33,8 @@ class ApiQueryInfo extends ApiQueryBase {
 
 	private $fld_protection = false, $fld_talkid = false,
 		$fld_subjectid = false, $fld_url = false,
-		$fld_readable = false, $fld_watched = false, $fld_notificationtimestamp = false,
+		$fld_readable = false, $fld_watched = false, $fld_watchers = false,
+		$fld_notificationtimestamp = false,
 		$fld_preload = false, $fld_displaytitle = false;
 
 	private $params, $titles, $missing, $everything, $pageCounter;
@@ -41,7 +42,8 @@ class ApiQueryInfo extends ApiQueryBase {
 	private $pageRestrictions, $pageIsRedir, $pageIsNew, $pageTouched,
 		$pageLatest, $pageLength;
 
-	private $protections, $watched, $notificationtimestamps, $talkids, $subjectids, $displaytitles;
+	private $protections, $watched, $watchers, $notificationtimestamps, $talkids, $subjectids, $displaytitles;
+	private $showZeroWatchers = false;
 
 	private $tokenFunctions;
 
@@ -54,11 +56,11 @@ class ApiQueryInfo extends ApiQueryBase {
 	 * @return void
 	 */
 	public function requestExtraData( $pageSet ) {
-		global $wgDisableCounters;
+		global $wgDisableCounters, $wgContentHandlerUseDB;
 
 		$pageSet->requestField( 'page_restrictions' );
 		// when resolving redirects, no page will have this field
-		if( !$pageSet->isResolvingRedirects() ) {
+		if ( !$pageSet->isResolvingRedirects() ) {
 			$pageSet->requestField( 'page_is_redirect' );
 		}
 		$pageSet->requestField( 'page_is_new' );
@@ -68,6 +70,9 @@ class ApiQueryInfo extends ApiQueryBase {
 		$pageSet->requestField( 'page_touched' );
 		$pageSet->requestField( 'page_latest' );
 		$pageSet->requestField( 'page_len' );
+		if ( $wgContentHandlerUseDB ) {
+			$pageSet->requestField( 'page_content_model' );
+		}
 	}
 
 	/**
@@ -96,7 +101,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			'unblock' => array( 'ApiQueryInfo', 'getUnblockToken' ),
 			'email' => array( 'ApiQueryInfo', 'getEmailToken' ),
 			'import' => array( 'ApiQueryInfo', 'getImportToken' ),
-			'watch' => array( 'ApiQueryInfo', 'getWatchToken'),
+			'watch' => array( 'ApiQueryInfo', 'getWatchToken' ),
 		);
 		wfRunHooks( 'APIQueryInfoTokens', array( &$this->tokenFunctions ) );
 		return $this->tokenFunctions;
@@ -118,11 +123,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'edit' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'edit' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['edit'] ) ) {
+			ApiQueryInfo::$cachedTokens['edit'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'edit' ];
+		return ApiQueryInfo::$cachedTokens['edit'];
 	}
 
 	public static function getDeleteToken( $pageid, $title ) {
@@ -132,11 +137,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'delete' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'delete' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['delete'] ) ) {
+			ApiQueryInfo::$cachedTokens['delete'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'delete' ];
+		return ApiQueryInfo::$cachedTokens['delete'];
 	}
 
 	public static function getProtectToken( $pageid, $title ) {
@@ -146,11 +151,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'protect' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'protect' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['protect'] ) ) {
+			ApiQueryInfo::$cachedTokens['protect'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'protect' ];
+		return ApiQueryInfo::$cachedTokens['protect'];
 	}
 
 	public static function getMoveToken( $pageid, $title ) {
@@ -160,11 +165,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'move' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'move' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['move'] ) ) {
+			ApiQueryInfo::$cachedTokens['move'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'move' ];
+		return ApiQueryInfo::$cachedTokens['move'];
 	}
 
 	public static function getBlockToken( $pageid, $title ) {
@@ -174,11 +179,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'block' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'block' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['block'] ) ) {
+			ApiQueryInfo::$cachedTokens['block'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'block' ];
+		return ApiQueryInfo::$cachedTokens['block'];
 	}
 
 	public static function getUnblockToken( $pageid, $title ) {
@@ -193,11 +198,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'email' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'email' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['email'] ) ) {
+			ApiQueryInfo::$cachedTokens['email'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'email' ];
+		return ApiQueryInfo::$cachedTokens['email'];
 	}
 
 	public static function getImportToken( $pageid, $title ) {
@@ -207,11 +212,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'import' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'import' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['import'] ) ) {
+			ApiQueryInfo::$cachedTokens['import'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'import' ];
+		return ApiQueryInfo::$cachedTokens['import'];
 	}
 
 	public static function getWatchToken( $pageid, $title ) {
@@ -221,11 +226,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'watch' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'watch' ] = $wgUser->getEditToken( 'watch' );
+		if ( !isset( ApiQueryInfo::$cachedTokens['watch'] ) ) {
+			ApiQueryInfo::$cachedTokens['watch'] = $wgUser->getEditToken( 'watch' );
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'watch' ];
+		return ApiQueryInfo::$cachedTokens['watch'];
 	}
 
 	public static function getOptionsToken( $pageid, $title ) {
@@ -235,11 +240,11 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 
 		// The token is always the same, let's exploit that
-		if ( !isset( ApiQueryInfo::$cachedTokens[ 'options' ] ) ) {
-			ApiQueryInfo::$cachedTokens[ 'options' ] = $wgUser->getEditToken();
+		if ( !isset( ApiQueryInfo::$cachedTokens['options'] ) ) {
+			ApiQueryInfo::$cachedTokens['options'] = $wgUser->getEditToken();
 		}
 
-		return ApiQueryInfo::$cachedTokens[ 'options' ];
+		return ApiQueryInfo::$cachedTokens['options'];
 	}
 
 	public function execute() {
@@ -248,6 +253,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			$prop = array_flip( $this->params['prop'] );
 			$this->fld_protection = isset( $prop['protection'] );
 			$this->fld_watched = isset( $prop['watched'] );
+			$this->fld_watchers = isset( $prop['watchers'] );
 			$this->fld_notificationtimestamp = isset( $prop['notificationtimestamp'] );
 			$this->fld_talkid = isset( $prop['talkid'] );
 			$this->fld_subjectid = isset( $prop['subjectid'] );
@@ -268,10 +274,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			// Throw away any titles we're gonna skip so they don't
 			// clutter queries
 			$cont = explode( '|', $this->params['continue'] );
-			if ( count( $cont ) != 2 ) {
-				$this->dieUsage( 'Invalid continue param. You should pass the original ' .
-						'value returned by the previous query', '_badcontinue' );
-			}
+			$this->dieContinueUsageIf( count( $cont ) != 2 );
 			$conttitle = Title::makeTitleSafe( $cont[0], $cont[1] );
 			foreach ( $this->everything as $pageid => $title ) {
 				if ( Title::compare( $title, $conttitle ) >= 0 ) {
@@ -308,6 +311,10 @@ class ApiQueryInfo extends ApiQueryBase {
 			$this->getWatchedInfo();
 		}
 
+		if ( $this->fld_watchers ) {
+			$this->getWatcherInfo();
+		}
+
 		// Run the talkid/subjectid query if requested
 		if ( $this->fld_talkid || $this->fld_subjectid ) {
 			$this->getTSIDs();
@@ -317,6 +324,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			$this->getDisplayTitle();
 		}
 
+		/** @var $title Title */
 		foreach ( $this->everything as $pageid => $title ) {
 			$pageInfo = $this->extractPageInfo( $pageid, $title );
 			$fit = $result->addValue( array(
@@ -334,7 +342,7 @@ class ApiQueryInfo extends ApiQueryBase {
 
 	/**
 	 * Get a result array with information about a title
-	 * @param $pageid int Page ID (negative for missing titles)
+	 * @param int $pageid Page ID (negative for missing titles)
 	 * @param $title Title object
 	 * @return array
 	 */
@@ -343,13 +351,17 @@ class ApiQueryInfo extends ApiQueryBase {
 		$titleExists = $pageid > 0; //$title->exists() needs pageid, which is not set for all title objects
 		$ns = $title->getNamespace();
 		$dbkey = $title->getDBkey();
+
+		$pageInfo['contentmodel'] = $title->getContentModel();
+		$pageInfo['pagelanguage'] = $title->getPageLanguage()->getCode();
+
 		if ( $titleExists ) {
 			global $wgDisableCounters;
 
 			$pageInfo['touched'] = wfTimestamp( TS_ISO_8601, $this->pageTouched[$pageid] );
 			$pageInfo['lastrevid'] = intval( $this->pageLatest[$pageid] );
 			$pageInfo['counter'] = $wgDisableCounters
-				? ""
+				? ''
 				: intval( $this->pageCounter[$pageid] );
 			$pageInfo['length'] = intval( $this->pageLength[$pageid] );
 
@@ -387,6 +399,14 @@ class ApiQueryInfo extends ApiQueryBase {
 			$pageInfo['watched'] = '';
 		}
 
+		if ( $this->fld_watchers ) {
+			if ( isset( $this->watchers[$ns][$dbkey] ) ) {
+				$pageInfo['watchers'] = $this->watchers[$ns][$dbkey];
+			} elseif ( $this->showZeroWatchers ) {
+				$pageInfo['watchers'] = 0;
+			}
+		}
+
 		if ( $this->fld_notificationtimestamp ) {
 			$pageInfo['notificationtimestamp'] = '';
 			if ( isset( $this->notificationtimestamps[$ns][$dbkey] ) ) {
@@ -394,7 +414,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			}
 		}
 
-		if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) )	{
+		if ( $this->fld_talkid && isset( $this->talkids[$ns][$dbkey] ) ) {
 			$pageInfo['talkid'] = $this->talkids[$ns][$dbkey];
 		}
 
@@ -406,7 +426,7 @@ class ApiQueryInfo extends ApiQueryBase {
 			$pageInfo['fullurl'] = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT );
 			$pageInfo['editurl'] = wfExpandUrl( $title->getFullURL( 'action=edit' ), PROTO_CURRENT );
 		}
-		if ( $this->fld_readable && $title->userCan( 'read' ) ) {
+		if ( $this->fld_readable && $title->userCan( 'read', $this->getUser() ) ) {
 			$pageInfo['readable'] = '';
 		}
 
@@ -450,6 +470,7 @@ class ApiQueryInfo extends ApiQueryBase {
 
 			$res = $this->select( __METHOD__ );
 			foreach ( $res as $row ) {
+				/** @var $title Title */
 				$title = $this->titles[$row->pr_page];
 				$a = array(
 					'type' => $row->pr_type,
@@ -462,7 +483,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				$this->protections[$title->getNamespace()][$title->getDBkey()][] = $a;
 			}
 			// Also check old restrictions
-			foreach( $this->titles as $pageId => $title ) {
+			foreach ( $this->titles as $pageId => $title ) {
 				if ( $this->pageRestrictions[$pageId] ) {
 					$namespace = $title->getNamespace();
 					$dbKey = $title->getDBkey();
@@ -585,6 +606,7 @@ class ApiQueryInfo extends ApiQueryBase {
 	private function getTSIDs() {
 		$getTitles = $this->talkids = $this->subjectids = array();
 
+		/** @var $t Title */
 		foreach ( $this->everything as $t ) {
 			if ( MWNamespace::isTalk( $t->getNamespace() ) ) {
 				if ( $this->fld_subjectid ) {
@@ -647,7 +669,9 @@ class ApiQueryInfo extends ApiQueryBase {
 	private function getWatchedInfo() {
 		$user = $this->getUser();
 
-		if ( $user->isAnon() || count( $this->everything ) == 0 ) {
+		if ( $user->isAnon() || count( $this->everything ) == 0
+			|| !$user->isAllowed( 'viewmywatchlist' )
+		) {
 			return;
 		}
 
@@ -678,6 +702,46 @@ class ApiQueryInfo extends ApiQueryBase {
 		}
 	}
 
+	/**
+	 * Get the count of watchers and put it in $this->watchers
+	 */
+	private function getWatcherInfo() {
+		global $wgUnwatchedPageThreshold;
+
+		if ( count( $this->everything ) == 0 ) {
+			return;
+		}
+
+		$user = $this->getUser();
+		$canUnwatchedpages = $user->isAllowed( 'unwatchedpages' );
+		if ( !$canUnwatchedpages && !is_int( $wgUnwatchedPageThreshold ) ) {
+			return;
+		}
+
+		$this->watchers = array();
+		$this->showZeroWatchers = $canUnwatchedpages;
+		$db = $this->getDB();
+
+		$lb = new LinkBatch( $this->everything );
+
+		$this->resetQueryParams();
+		$this->addTables( array( 'watchlist' ) );
+		$this->addFields( array( 'wl_title', 'wl_namespace', 'count' => 'COUNT(*)' ) );
+		$this->addWhere( array(
+			$lb->constructSet( 'wl', $db )
+		) );
+		$this->addOption( 'GROUP BY', array( 'wl_namespace', 'wl_title' ) );
+		if ( !$canUnwatchedpages ) {
+			$this->addOption( 'HAVING', "COUNT(*) >= $wgUnwatchedPageThreshold" );
+		}
+
+		$res = $this->select( __METHOD__ );
+
+		foreach ( $res as $row ) {
+			$this->watchers[$row->wl_namespace][$row->wl_title] = (int)$row->count;
+		}
+	}
+
 	public function getCacheMode( $params ) {
 		$publicProps = array(
 			'protection',
@@ -709,6 +773,7 @@ class ApiQueryInfo extends ApiQueryBase {
 					'protection',
 					'talkid',
 					'watched', # private
+					'watchers', # private
 					'notificationtimestamp', # private
 					'subjectid',
 					'url',
@@ -734,6 +799,7 @@ class ApiQueryInfo extends ApiQueryBase {
 				' protection            - List the protection level of each page',
 				' talkid                - The page ID of the talk page for each non-talk page',
 				' watched               - List the watched status of each page',
+				' watchers              - The number of watchers, if allowed',
 				' notificationtimestamp - The watchlist notification timestamp of each page',
 				' subjectid             - The page ID of the parent page for each talk page',
 				' url                   - Gives a full URL to the page, and also an edit URL',
@@ -762,11 +828,18 @@ class ApiQueryInfo extends ApiQueryBase {
 				'starttimestamp' => array(
 					ApiBase::PROP_TYPE => 'timestamp',
 					ApiBase::PROP_NULLABLE => true
-				)
+				),
+				'contentmodel' => 'string',
 			),
 			'watched' => array(
 				'watched' => 'boolean'
 			),
+			'watchers' => array(
+				'watchers' => array(
+					ApiBase::PROP_TYPE => 'integer',
+					ApiBase::PROP_NULLABLE => true
+				)
+			),
 			'notificationtimestamp' => array(
 				'notificationtimestamp' => array(
 					ApiBase::PROP_TYPE => 'timestamp',
@@ -809,12 +882,6 @@ class ApiQueryInfo extends ApiQueryBase {
 		return 'Get basic page information such as namespace, title, last touched date, ...';
 	}
 
-	public function getPossibleErrors() {
-		return array_merge( parent::getPossibleErrors(), array(
-			array( 'code' => '_badcontinue', 'info' => 'Invalid continue param. You should pass the original value returned by the previous query' ),
-		) );
-	}
-
 	public function getExamples() {
 		return array(
 			'api.php?action=query&prop=info&titles=Main%20Page',
@@ -825,8 +892,4 @@ class ApiQueryInfo extends ApiQueryBase {
 	public function getHelpUrls() {
 		return 'https://www.mediawiki.org/wiki/API:Properties#info_.2F_in';
 	}
-
-	public function getVersion() {
-		return __CLASS__ . ': $Id$';
-	}
 }