From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/db/LBFactory_Single.php | 42 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'includes/db/LBFactory_Single.php') diff --git a/includes/db/LBFactory_Single.php b/includes/db/LBFactory_Single.php index 25acdc5b..89b41321 100644 --- a/includes/db/LBFactory_Single.php +++ b/includes/db/LBFactory_Single.php @@ -7,29 +7,55 @@ class LBFactory_Single extends LBFactory { protected $lb; /** - * @param $conf An associative array with one member: + * @param $conf array An associative array with one member: * - connection: The DatabaseBase connection object */ function __construct( $conf ) { $this->lb = new LoadBalancer_Single( $conf ); } + /** + * @param $wiki + * + * @return LoadBalancer_Single + */ function newMainLB( $wiki = false ) { return $this->lb; } + /** + * @param $wiki + * + * @return LoadBalancer_Single + */ function getMainLB( $wiki = false ) { return $this->lb; } + /** + * @param $cluster + * @param $wiki + * + * @return LoadBalancer_Single + */ function newExternalLB( $cluster, $wiki = false ) { return $this->lb; } + /** + * @param $cluster + * @param $wiki + * + * @return LoadBalancer_Single + */ function &getExternalLB( $cluster, $wiki = false ) { return $this->lb; } + /** + * @param $callback string|array + * @param $params array + */ function forEachLB( $callback, $params = array() ) { call_user_func_array( $callback, array_merge( array( $this->lb ), $params ) ); } @@ -39,8 +65,15 @@ class LBFactory_Single extends LBFactory { * Helper class for LBFactory_Single. */ class LoadBalancer_Single extends LoadBalancer { + + /** + * @var DatabaseBase + */ var $db; + /** + * @param $params array + */ function __construct( $params ) { $this->db = $params['connection']; parent::__construct( array( 'servers' => array( array( @@ -51,6 +84,13 @@ class LoadBalancer_Single extends LoadBalancer { ) ) ) ); } + /** + * + * @param $server string + * @param $dbNameOverride bool + * + * @return DatabaseBase + */ function reallyOpenConnection( $server, $dbNameOverride = false ) { return $this->db; } -- cgit v1.2.3-54-g00ecf