From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 15 Dec 2006 13:45:05 +0000 (+0000)
Subject: Removed broken feature $wgBreakFramesExceptions
X-Git-Tag: 1.31.0-rc.0~54893
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8a7a4aac72ffbbd5cb43c4be901d2b83f3531692;p=lhc%2Fweb%2Fwiklou.git

Removed broken feature $wgBreakFramesExceptions
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7df1fe8d95..fb228fcb5b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2340,12 +2340,4 @@ $wgParserTestFiles = array(
  */
 $wgBreakFrames = false;
 
-/**
- * Break frameset exception list
- */
-$wgBreakFramesExceptions = array(
-	'babelfish.altavista.com',
-	'translate.google.com',
-);
-
 ?>
diff --git a/includes/Skin.php b/includes/Skin.php
index 8a297e4fd8..d417f57252 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -292,7 +292,7 @@ class Skin extends Linker {
 		global $wgStylePath, $wgUser;
 		global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
 		global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
-		global $wgBreakFrames, $wgBreakFramesExceptions;
+		global $wgBreakFrames;
 
 		$ns = $wgTitle->getNamespace();
 		$nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
@@ -313,7 +313,6 @@ class Skin extends Linker {
 			'wgUserLanguage' => $wgLang->getCode(),
 			'wgContentLanguage' => $wgContLang->getCode(),
 			'wgBreakFrames' => $wgBreakFrames,
-			'wgBreakFramesExceptions' => $wgBreakFramesExceptions,
 			'wgCurRevisionId' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
 		);
 
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index fe0278a9bc..ef4ebc6f07 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -50,7 +50,7 @@ if (typeof stylepath != 'undefined' && typeof skin != 'undefined') {
 
 if (wgBreakFrames) {
 	// Un-trap us from framesets
-	if (window.top != window && wgBreakFramesExceptions.indexOf(window.top.location.hostname) == -1) {
+	if (window.top != window) {
 		window.top.location = window.location;
 	}
 }