Removed broken feature $wgBreakFramesExceptions

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7df1fe8..fb228fc 100644 (file)
--- 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 8a297e4..d417f57 100644 (file)
--- 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 fe0278a..ef4ebc6 100644 (file)
--- 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;
        }
 }