From d81f562b712f2387fa02290bf2ca86392ab356f2 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 11 Oct 2006 20:21:25 +0000
Subject: Aktualisierung auf Version 1.8.1

---
 includes/ObjectCache.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'includes/ObjectCache.php')

diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php
index fe7417d2..2b26cf4e 100644
--- a/includes/ObjectCache.php
+++ b/includes/ObjectCache.php
@@ -69,13 +69,10 @@ function &wfGetCache( $inputType ) {
 	} elseif ( $type == CACHE_ACCEL ) {
 		if ( !array_key_exists( CACHE_ACCEL, $wgCaches ) ) {
 			if ( function_exists( 'eaccelerator_get' ) ) {
-				require_once( 'BagOStuff.php' );
 				$wgCaches[CACHE_ACCEL] = new eAccelBagOStuff;
 			} elseif ( function_exists( 'apc_fetch') ) {
-				require_once( 'BagOStuff.php' );
 				$wgCaches[CACHE_ACCEL] = new APCBagOStuff;
 			} elseif ( function_exists( 'mmcache_get' ) ) {
-				require_once( 'BagOStuff.php' );
 				$wgCaches[CACHE_ACCEL] = new TurckBagOStuff;
 			} else {
 				$wgCaches[CACHE_ACCEL] = false;
@@ -84,11 +81,15 @@ function &wfGetCache( $inputType ) {
 		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 ) ) {
-			require_once( 'BagOStuff.php' );
 			$wgCaches[CACHE_DB] = new MediaWikiBagOStuff('objectcache');
 		}
 		$cache =& $wgCaches[CACHE_DB];
-- 
cgit v1.2.3-54-g00ecf