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

[<var...@us...>]

Revision: 7229
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7229&view=rev
Author:   vargenau
Date:     2009-10-21 06:19:58 +0000 (Wed, 21 Oct 2009)

Log Message:
-----------
Use GFORGE instead of $WikiTheme

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/UpLoad.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/CachedMarkup.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -42,8 +42,7 @@
         // a single quote is entered in the Summary box:
         // - the history is wrong (user and comment missing)
         // - the table of contents plugin no longer works
-        global $WikiTheme;
-        if (isa($WikiTheme, 'WikiTheme_gforge')) {
+        if (defined('GFORGE') and GFORGE) {
             return serialize($this);
         }
 

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/plugin/PluginManager.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -86,8 +86,6 @@
 
     function _generateTableBody(&$info, &$dbi, &$request, &$table) {
 
-        global $WikiTheme;
-
         $plugin_dir = 'lib/plugin';
         if (defined('PHPWIKI_DIR'))
             $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
@@ -124,7 +122,7 @@
             // make a link if an actionpage exists
             $pluginNamelink = $pluginName;
             $pluginDocPageName = _("Help")."/" . $pluginName . "Plugin";
-            if (isa($WikiTheme, 'WikiTheme_gforge')) {
+            if (defined('GFORGE') and GFORGE) {
                 $pluginDocPageName = _("Help").":" . $pluginName . "Plugin";
             }
 
@@ -152,7 +150,7 @@
                     $pluginDocPageNamelink = WikiLink($pluginDocPageName,'if_known');
             }
 
-            if (isa($WikiTheme, 'WikiTheme_gforge')) {
+            if (defined('GFORGE') and GFORGE) {
                 $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
             }
 

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2009-10-21 05:57:01 UTC (rev 7228)
+++ trunk/lib/plugin/UpLoad.php	2009-10-21 06:19:58 UTC (rev 7229)
@@ -178,8 +178,7 @@
             // Make sure that the user is logged in.
             $user = $request->getUser();
             if (!$user->isAuthenticated()) {
-                global $WikiTheme;
-                if (isa($WikiTheme, 'WikiTheme_gforge')) {
+                if (defined('GFORGE') and GFORGE) {
                     $message->pushContent(HTML::div(array('class' => 'error'),
                                             HTML::p(_("You cannot upload files.")),
                                             HTML::ul(


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