From 743b122d5692ad54ca482eec8f0ee52a7ad617e6 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 26 Jun 2010 18:20:01 +0000
Subject: [PATCH] No target _top

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7580 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 themes/Wordpress/themeinfo.php      | 4 +---
 themes/default/templates/debug.tmpl | 8 ++++----
 themes/default/templates/top.tmpl   | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/themes/Wordpress/themeinfo.php b/themes/Wordpress/themeinfo.php
index 52ccdc7f1..4d0e97480 100644
--- a/themes/Wordpress/themeinfo.php
+++ b/themes/Wordpress/themeinfo.php
@@ -39,9 +39,7 @@ class WikiTheme_Wordpress extends WikiTheme {
             $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text)));
             $link->setAttr('class', 'wikiunknown');
         }
-        if ($request->getArg('frame'))
-            $link->setAttr('target', '_top');
-        
+
         return $link;
     }
     function getRecentChangesFormatter ($format) {
diff --git a/themes/default/templates/debug.tmpl b/themes/default/templates/debug.tmpl
index f0fcbefcd..6d1a64dc3 100644
--- a/themes/default/templates/debug.tmpl
+++ b/themes/default/templates/debug.tmpl
@@ -5,12 +5,12 @@
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <tr><td>
 <?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?>
-<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top"><img
-        id="xhtml" border="0"
+<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img
+        id="xhtml"
         src="<?=$WikiTheme->_findData('buttons/valid-xhtml10.png')?>"
         alt="Valid XHTML 1.0!" height="31" width="88" /></a>
-<a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top"><img
-        id="css" border="0"
+<a href="http://jigsaw.w3.org/css-validator/check/referer"><img
+        id="css"
         src="<?=$WikiTheme->_findData('buttons/vcss.png')?>"
         alt="Valid CSS!" height="31" width="88" /></a>
 </div>
diff --git a/themes/default/templates/top.tmpl b/themes/default/templates/top.tmpl
index 904f802c6..de6f29a92 100644
--- a/themes/default/templates/top.tmpl
+++ b/themes/default/templates/top.tmpl
@@ -6,7 +6,7 @@ if (!$HIDE_TOOLBARS) {
 ?>
 <!-- The logo -->
 <div id="logo"><a class="wikilink" 
-    href="<?=WikiURL(HOME_PAGE)?>" target="_top"
+    href="<?=WikiURL(HOME_PAGE)?>"
     ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img"
       border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a></div>
 <!-- The top navigation/search bar -->
-- 
2.45.2