diff --git a/ChangeLog b/ChangeLog
index 1297d8a12e1f6953e6bac4317a5d1955970d1a48..7b6e5ca122eba3de457ea5fa32eed501aff93749 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-17  Benjamin Mack  <benni@typo3.org>
+
+	* Commited test case for #12244: Improve locallangXMLOverride feature (Thanks to Steffen Gebert), this changes the LLoverride feature to $GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride'] as an array
+
 2009-11-17  Steffen Kamper  <info@sk-typo3.de>
 
 	* Fixed bug #12624: Unreplaced marker in login screen of classic skin
diff --git a/tests/t3lib/t3lib_div_testcase.php b/tests/t3lib/t3lib_div_testcase.php
index d75fd45e0f4f2183fb8d61ae65a6f878354b8faf..450f76011cedac3b6dd553e63a094805c08af306 100644
--- a/tests/t3lib/t3lib_div_testcase.php
+++ b/tests/t3lib/t3lib_div_testcase.php
@@ -658,6 +658,41 @@ class t3lib_div_testcase extends tx_phpunit_testcase {
 			t3lib_div::quoteJSvalue('\\')
 		);
 	}
+
+	/**
+	 * Tests the locallangXMLOverride feature of readLLfile()
+	 * @test
+	 */
+	public function readLLfileLocallangXMLOverride() {
+		$unique = uniqid('locallangXMLOverrideTest');
+		
+		$xml = '<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+			<T3locallang>
+				<data type="array">
+					<languageKey index="default" type="array">
+						<label index="buttons.logout">EXIT</label>
+					</languageKey>
+				</data>
+			</T3locallang>';
+
+		$file = PATH_site . 'typo3temp/' . $unique . '.xml';
+		t3lib_div::writeFileToTypo3tempDir($file, $xml);
+
+			// get default value
+		$defaultLL = t3lib_div::readLLfile('EXT:lang/locallang_core.xml', 'default');
+
+			// set override file
+		$GLOBALS['TYPO3_CONF_VARS']['SYS']['locallangXMLOverride']['EXT:lang/locallang_core.xml'][$unique] = $file;
+
+			// get override value
+		$overrideLL = t3lib_div::readLLfile('EXT:lang/locallang_core.xml', 'default');
+
+		$this->assertNotEquals($overrideLL['default']['buttons.logout'], '');
+		$this->assertNotEquals($defaultLL['default']['buttons.logout'], $overrideLL['default']['buttons.logout']);
+		$this->assertEquals($overrideLL['default']['buttons.logout'], 'EXIT');
+
+		unlink($file);
+	}
 }
 
 ?>
\ No newline at end of file