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, 507 insertions, 0 deletions

diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
new file mode 100644
index 00000000..11141e07
--- /dev/null
+++ b/includes/site/SiteSQLStore.php
@@ -0,0 +1,507 @@
+<?php
+
+/**
+ * Represents the site configuration of a wiki.
+ * Holds a list of sites (ie SiteList) and takes care
+ * of retrieving and caching site information when appropriate.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 1.21
+ *
+ * @file
+ * @ingroup Site
+ *
+ * @license GNU GPL v2+
+ * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ */
+class SiteSQLStore implements SiteStore {
+
+	/**
+	 * @since 1.21
+	 *
+	 * @var SiteList|null
+	 */
+	protected $sites = null;
+
+	/**
+	 * @var ORMTable
+	 */
+	protected $sitesTable;
+
+	/**
+	 * @var string|null
+	 */
+	private $cacheKey = null;
+
+	/**
+	 * @var int
+	 */
+	private $cacheTimeout = 3600;
+
+	/**
+	 * @since 1.21
+	 *
+	 * @param ORMTable|null $sitesTable
+	 *
+	 * @return SiteStore
+	 */
+	public static function newInstance( ORMTable $sitesTable = null ) {
+		return new static( $sitesTable );
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 1.21
+	 *
+	 * @param ORMTable|null $sitesTable
+	 */
+	protected function __construct( ORMTable $sitesTable = null ) {
+		if ( $sitesTable === null ) {
+			$sitesTable = $this->newSitesTable();
+		}
+
+		$this->sitesTable = $sitesTable;
+	}
+
+	/**
+	 * Constructs a cache key to use for caching the list of sites.
+	 *
+	 * This includes the concrete class name of the site list as well as a version identifier
+	 * for the list's serialization, to avoid problems when unserializing site lists serialized
+	 * by an older version, e.g. when reading from a cache.
+	 *
+	 * The cache key also includes information about where the sites were loaded from, e.g.
+	 * the name of a database table.
+	 *
+	 * @see SiteList::getSerialVersionId
+	 *
+	 * @return String The cache key.
+	 */
+	protected function getCacheKey() {
+		wfProfileIn( __METHOD__ );
+
+		if ( $this->cacheKey === null ) {
+			$type = 'SiteList#' . SiteList::getSerialVersionId();
+			$source = $this->sitesTable->getName();
+
+			if ( $this->sitesTable->getTargetWiki() !== false ) {
+				$source = $this->sitesTable->getTargetWiki() . '.' . $source;
+			}
+
+			$this->cacheKey = wfMemcKey( "$source/$type" );
+		}
+
+		wfProfileOut( __METHOD__ );
+		return $this->cacheKey;
+	}
+
+	/**
+	 * @see SiteStore::getSites
+	 *
+	 * @since 1.21
+	 *
+	 * @param string $source either 'cache' or 'recache'
+	 *
+	 * @return SiteList
+	 */
+	public function getSites( $source = 'cache' ) {
+		wfProfileIn( __METHOD__ );
+
+		if ( $source === 'cache' ) {
+			if ( $this->sites === null ) {
+				$cache = wfGetMainCache();
+				$sites = $cache->get( $this->getCacheKey() );
+
+				if ( is_object( $sites ) ) {
+					$this->sites = $sites;
+				} else {
+					$this->loadSites();
+				}
+			}
+		}
+		else {
+			$this->loadSites();
+		}
+
+		wfProfileOut( __METHOD__ );
+		return $this->sites;
+	}
+
+	/**
+	 * Returns a new Site object constructed from the provided ORMRow.
+	 *
+	 * @since 1.21
+	 *
+	 * @param ORMRow $siteRow
+	 *
+	 * @return Site
+	 */
+	protected function siteFromRow( ORMRow $siteRow ) {
+		wfProfileIn( __METHOD__ );
+
+		$site = Site::newForType( $siteRow->getField( 'type', Site::TYPE_UNKNOWN ) );
+
+		$site->setGlobalId( $siteRow->getField( 'global_key' ) );
+
+		$site->setInternalId( $siteRow->getField( 'id' ) );
+
+		if ( $siteRow->hasField( 'forward' ) ) {
+			$site->setForward( $siteRow->getField( 'forward' ) );
+		}
+
+		if ( $siteRow->hasField( 'group' ) ) {
+			$site->setGroup( $siteRow->getField( 'group' ) );
+		}
+
+		if ( $siteRow->hasField( 'language' ) ) {
+			$site->setLanguageCode( $siteRow->getField( 'language' ) === '' ? null : $siteRow->getField( 'language' ) );
+		}
+
+		if ( $siteRow->hasField( 'source' ) ) {
+			$site->setSource( $siteRow->getField( 'source' ) );
+		}
+
+		if ( $siteRow->hasField( 'data' ) ) {
+			$site->setExtraData( $siteRow->getField( 'data' ) );
+		}
+
+		if ( $siteRow->hasField( 'config' ) ) {
+			$site->setExtraConfig( $siteRow->getField( 'config' ) );
+		}
+
+		wfProfileOut( __METHOD__ );
+		return $site;
+	}
+
+	/**
+	 * Get a new ORMRow from a Site object
+	 *
+	 * @since 1.22
+	 *
+	 * @param Site
+	 *
+	 * @return ORMRow
+	 */
+	protected function getRowFromSite( Site $site ) {
+		$fields = array(
+			// Site data
+			'global_key' => $site->getGlobalId(), // TODO: check not null
+			'type' => $site->getType(),
+			'group' => $site->getGroup(),
+			'source' => $site->getSource(),
+			'language' => $site->getLanguageCode() === null ? '' : $site->getLanguageCode(),
+			'protocol' => $site->getProtocol(),
+			'domain' => strrev( $site->getDomain() ) . '.',
+			'data' => $site->getExtraData(),
+
+			// Site config
+			'forward' => $site->shouldForward(),
+			'config' => $site->getExtraConfig(),
+		);
+
+		if ( $site->getInternalId() !== null ) {
+			$fields['id'] = $site->getInternalId();
+		}
+
+		return new ORMRow( $this->sitesTable, $fields );
+	}
+
+	/**
+	 * Fetches the site from the database and loads them into the sites field.
+	 *
+	 * @since 1.21
+	 */
+	protected function loadSites() {
+		wfProfileIn( __METHOD__ );
+
+		$this->sites = new SiteList();
+
+		foreach ( $this->sitesTable->select() as $siteRow ) {
+			$this->sites[] = $this->siteFromRow( $siteRow );
+		}
+
+		// Batch load the local site identifiers.
+		$ids = wfGetDB( $this->sitesTable->getReadDb() )->select(
+			'site_identifiers',
+			array(
+				'si_site',
+				'si_type',
+				'si_key',
+			),
+			array(),
+			__METHOD__
+		);
+
+		foreach ( $ids as $id ) {
+			if ( $this->sites->hasInternalId( $id->si_site ) ) {
+				$site = $this->sites->getSiteByInternalId( $id->si_site );
+				$site->addLocalId( $id->si_type, $id->si_key );
+				$this->sites->setSite( $site );
+			}
+		}
+
+		$cache = wfGetMainCache();
+		$cache->set( $this->getCacheKey(), $this->sites, $this->cacheTimeout );
+
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * @see SiteStore::getSite
+	 *
+	 * @since 1.21
+	 *
+	 * @param string $globalId
+	 * @param string $source
+	 *
+	 * @return Site|null
+	 */
+	public function getSite( $globalId, $source = 'cache' ) {
+		wfProfileIn( __METHOD__ );
+
+		$sites = $this->getSites( $source );
+
+		wfProfileOut( __METHOD__ );
+		return $sites->hasSite( $globalId ) ? $sites->getSite( $globalId ) : null;
+	}
+
+	/**
+	 * @see SiteStore::saveSite
+	 *
+	 * @since 1.21
+	 *
+	 * @param Site $site
+	 *
+	 * @return boolean Success indicator
+	 */
+	public function saveSite( Site $site ) {
+		return $this->saveSites( array( $site ) );
+	}
+
+	/**
+	 * @see SiteStore::saveSites
+	 *
+	 * @since 1.21
+	 *
+	 * @param Site[] $sites
+	 *
+	 * @return boolean Success indicator
+	 */
+	public function saveSites( array $sites ) {
+		wfProfileIn( __METHOD__ );
+
+		if ( empty( $sites ) ) {
+			wfProfileOut( __METHOD__ );
+			return true;
+		}
+
+		$dbw = $this->sitesTable->getWriteDbConnection();
+
+		$trx = $dbw->trxLevel();
+
+		if ( $trx == 0 ) {
+			$dbw->begin( __METHOD__ );
+		}
+
+		$success = true;
+
+		$internalIds = array();
+		$localIds = array();
+
+		foreach ( $sites as $site ) {
+			if ( $site->getInternalId() !== null ) {
+				$internalIds[] = $site->getInternalId();
+			}
+
+			$siteRow = $this->getRowFromSite( $site );
+			$success = $siteRow->save( __METHOD__ ) && $success;
+
+			foreach ( $site->getLocalIds() as $idType => $ids ) {
+				foreach ( $ids as $id ) {
+					$localIds[] = array( $siteRow->getId(), $idType, $id );
+				}
+			}
+		}
+
+		if ( $internalIds !== array() ) {
+			$dbw->delete(
+				'site_identifiers',
+				array( 'si_site' => $internalIds ),
+				__METHOD__
+			);
+		}
+
+		foreach ( $localIds as $localId ) {
+			$dbw->insert(
+				'site_identifiers',
+				array(
+					'si_site' => $localId[0],
+					'si_type' => $localId[1],
+					'si_key' => $localId[2],
+				),
+				__METHOD__
+			);
+		}
+
+		if ( $trx == 0 ) {
+			$dbw->commit( __METHOD__ );
+		}
+
+		// purge cache
+		$this->reset();
+
+		wfProfileOut( __METHOD__ );
+		return $success;
+	}
+
+	/**
+	 * Purges the internal and external cache of the site list, forcing the list
+	 * of sites to be re-read from the database.
+	 *
+	 * @since 1.21
+	 */
+	public function reset() {
+		wfProfileIn( __METHOD__ );
+		// purge cache
+		$cache = wfGetMainCache();
+		$cache->delete( $this->getCacheKey() );
+		$this->sites = null;
+
+		wfProfileOut( __METHOD__ );
+	}
+
+	/**
+	 * Clears the list of sites stored in the database.
+	 *
+	 * @see SiteStore::clear()
+	 *
+	 * @return bool success
+	 */
+	public function clear() {
+		wfProfileIn( __METHOD__ );
+		$dbw = $this->sitesTable->getWriteDbConnection();
+
+		$trx = $dbw->trxLevel();
+
+		if ( $trx == 0 ) {
+			$dbw->begin( __METHOD__ );
+		}
+
+		$ok = $dbw->delete( 'sites', '*', __METHOD__ );
+		$ok = $dbw->delete( 'site_identifiers', '*', __METHOD__ ) && $ok;
+
+		if ( $trx == 0 ) {
+			$dbw->commit( __METHOD__ );
+		}
+
+		$this->reset();
+
+		wfProfileOut( __METHOD__ );
+		return $ok;
+	}
+
+	/**
+	 * @since 1.21
+	 *
+	 * @return ORMTable
+	 */
+	protected function newSitesTable() {
+		return new ORMTable(
+			'sites',
+			array(
+				'id' => 'id',
+
+				// Site data
+				'global_key' => 'str',
+				'type' => 'str',
+				'group' => 'str',
+				'source' => 'str',
+				'language' => 'str',
+				'protocol' => 'str',
+				'domain' => 'str',
+				'data' => 'array',
+
+				// Site config
+				'forward' => 'bool',
+				'config' => 'array',
+			),
+			array(
+				'type' => Site::TYPE_UNKNOWN,
+				'group' => Site::GROUP_NONE,
+				'source' => Site::SOURCE_LOCAL,
+				'data' => array(),
+
+				'forward' => false,
+				'config' => array(),
+				'language' => '',
+			),
+			'ORMRow',
+			'site_'
+		);
+	}
+
+}
+
+/**
+ * @deprecated
+ */
+class Sites extends SiteSQLStore {
+
+	/**
+	 * Factory for creating new site objects.
+	 *
+	 * @since 1.21
+	 * @deprecated
+	 *
+	 * @param string|boolean false $globalId
+	 *
+	 * @return Site
+	 */
+	public static function newSite( $globalId = false ) {
+		$site = new Site();
+
+		if ( $globalId !== false ) {
+			$site->setGlobalId( $globalId );
+		}
+
+		return $site;
+	}
+
+	/**
+	 * @deprecated
+	 * @return SiteStore
+	 */
+	public static function singleton() {
+		static $singleton;
+
+		if ( $singleton === null ) {
+			$singleton = new static();
+		}
+
+		return $singleton;
+	}
+
+	/**
+	 * @deprecated
+	 * @return SiteList
+	 */
+	public function getSiteGroup( $group ) {
+		return $this->getSites()->getGroup( $group );
+	}
+
+}