From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
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/ObjectCache.php | 123 -----------------------------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 includes/ObjectCache.php

(limited to 'includes/ObjectCache.php')

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
deleted file mode 100644
index 05ae9c9c..00000000
--- a/includes/ObjectCache.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * Functions to get cache objects
- *
- * @file
- * @ingroup Cache
- */
-
-/**
- * FakeMemCachedClient imitates the API of memcached-client v. 0.1.2.
- * It acts as a memcached server with no RAM, that is, all objects are
- * cleared the moment they are set. All set operations succeed and all
- * get operations return null.
- * @ingroup Cache
- */
-class FakeMemCachedClient {
-	function add ($key, $val, $exp = 0) { return true; }
-	function decr ($key, $amt=1) { return null; }
-	function delete ($key, $time = 0) { return false; }
-	function disconnect_all () { }
-	function enable_compress ($enable) { }
-	function forget_dead_hosts () { }
-	function get ($key) { return null; }
-	function get_multi ($keys) { return array_pad(array(), count($keys), null); }
-	function incr ($key, $amt=1) { return null; }
-	function replace ($key, $value, $exp=0) { return false; }
-	function run_command ($sock, $cmd) { return null; }
-	function set ($key, $value, $exp=0){ return true; }
-	function set_compress_threshold ($thresh){ }
-	function set_debug ($dbg) { }
-	function set_servers ($list) { }
-}
-
-global $wgCaches;
-$wgCaches = array();
-
-/**
- * Get a cache object.
- * @param $inputType Integer: cache type, one the the CACHE_* constants. 
- */
-function &wfGetCache( $inputType ) {
-	global $wgCaches, $wgMemCachedServers, $wgMemCachedDebug, $wgMemCachedPersistent;
-	$cache = false;
-
-	if ( $inputType == CACHE_ANYTHING ) {
-		reset( $wgCaches );
-		$type = key( $wgCaches );
-		if ( $type === false || $type === CACHE_NONE ) {
-			$type = CACHE_DB;
-		}
-	} else {
-		$type = $inputType;
-	}
-
-	if ( $type == CACHE_MEMCACHED ) {
-		if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
-			$wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki(
-				array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
-			$wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers );
-			$wgCaches[CACHE_MEMCACHED]->set_debug( $wgMemCachedDebug );
-		}
-		$cache =& $wgCaches[CACHE_MEMCACHED];
-	} elseif ( $type == CACHE_ACCEL ) {
-		if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
-			if ( function_exists( 'eaccelerator_get' ) ) {
-				$wgCaches[CACHE_ACCEL] = new eAccelBagOStuff;
-			} elseif ( function_exists( 'apc_fetch') ) {
-				$wgCaches[CACHE_ACCEL] = new APCBagOStuff;
-			} elseif( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
-				$wgCaches[CACHE_ACCEL] = new XCacheBagOStuff();
-			} elseif( function_exists( 'wincache_ucache_get' ) ) {
-				$wgCaches[CACHE_ACCEL] = new WinCacheBagOStuff();
-			} else {
-				$wgCaches[CACHE_ACCEL] = false;
-			}
-		}
-		if ( $wgCaches[CACHE_ACCEL] !== false ) {
-			$cache =& $wgCaches[CACHE_ACCEL];
-		}
-	} elseif ( $type == CACHE_DBA ) {
-		if ( !array_key_exists( CACHE_DBA, $wgCaches ) ) {
-			$wgCaches[CACHE_DBA] = new DBABagOStuff;
-		}
-		$cache =& $wgCaches[CACHE_DBA];
-	}
-
-	if ( $type == CACHE_DB || ( $inputType == CACHE_ANYTHING && $cache === false ) ) {
-		if ( !array_key_exists( CACHE_DB, $wgCaches ) ) {
-			$wgCaches[CACHE_DB] = new SqlBagOStuff('objectcache');
-		}
-		$cache =& $wgCaches[CACHE_DB];
-	}
-
-	if ( $cache === false ) {
-		if ( !array_key_exists( CACHE_NONE, $wgCaches ) ) {
-			$wgCaches[CACHE_NONE] = new FakeMemCachedClient;
-		}
-		$cache =& $wgCaches[CACHE_NONE];
-	}
-
-	return $cache;
-}
-
-/** Get the main cache object */
-function &wfGetMainCache() {
-	global $wgMainCacheType;
-	$ret =& wfGetCache( $wgMainCacheType );
-	return $ret;
-}
-
-/** Get the cache object used by the message cache */
-function &wfGetMessageCacheStorage() {
-	global $wgMessageCacheType;
-	$ret =& wfGetCache( $wgMessageCacheType );
-	return $ret;
-}
-
-/** Get the cache object used by the parser cache */
-function &wfGetParserCacheStorage() {
-	global $wgParserCacheType;
-	$ret =& wfGetCache( $wgParserCacheType );
-	return $ret;
-}
-- 
cgit v1.2.3-54-g00ecf