[phpwiki-checkins] SF.net SVN: phpwiki:[7582] trunk/lib

[<ru...@us...>]

Revision: 7582
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7582&view=rev
Author:   rurban
Date:     2010-06-26 22:09:45 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Revert r7575 "No target _top"
There are target _tops in custom themes, esp. in frame'd wiki's.

Modified Paths:
--------------
    trunk/lib/WikiTheme.php
    trunk/lib/display.php

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2010-06-26 19:47:57 UTC (rev 7581)
+++ trunk/lib/WikiTheme.php	2010-06-26 22:09:45 UTC (rev 7582)
@@ -606,6 +606,8 @@
             $link->pushContent($this->maybeSplitWikiWord($default_text));
             $link->setAttr('class', 'wiki');
         }
+        if ($request->getArg('frame'))
+            $link->setAttr('target', '_top');
         return $link;
     }
 
@@ -660,6 +662,8 @@
             $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword));
             $link->pushContent($gbutton);
         }
+        if ($request->getArg('frame'))
+            $link->setAttr('target', '_top');
 
         return $link;
     }
@@ -1666,6 +1670,8 @@
         }
         if ($class)
             $this->setAttr('class', $class);
+        if ($request->getArg('frame'))
+            $this->setAttr('target', '_top');
         if (!empty($options) and is_array($options)) {
             foreach ($options as $key => $val)
                 $this->setAttr($key, $val);

Modified: trunk/lib/display.php
===================================================================
--- trunk/lib/display.php	2010-06-26 19:47:57 UTC (rev 7581)
+++ trunk/lib/display.php	2010-06-26 22:09:45 UTC (rev 7582)
@@ -266,6 +266,8 @@
                                    'class' => 'backlinks'),
                              $WikiTheme->maybeSplitWikiWord($pagename));
         $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename));
+        if ($request->getArg('frame'))
+            $pageheader->setAttr('target', '_top');
     }
 
     $pagetitle = SplitPagename($pagename);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.