[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian themeinfo.php,1.25,1.26

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

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869/Hawaiian

Modified Files:
	themeinfo.php 
Log Message:
renamed global $Theme to $WikiTheme (gforge nameclash)

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/themeinfo.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -2 -b -p -d -r1.25 -r1.26
--- themeinfo.php	28 Feb 2004 21:09:57 -0000	1.25
+++ themeinfo.php	14 Jun 2004 11:26:48 -0000	1.26
@@ -20,5 +20,5 @@ class Theme_Hawaiian extends Theme {
     }
 }
-$Theme = new Theme_Hawaiian('Hawaiian');
+$WikiTheme = new Theme_Hawaiian('Hawaiian');
 
 // CSS file defines fonts, colors and background images for this
@@ -26,14 +26,14 @@ $Theme = new Theme_Hawaiian('Hawaiian');
 // expected to be in the same directory that the base style is in.
 
-$Theme->setDefaultCSS('Hawaiian', 'Hawaiian.css');
-$Theme->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-$Theme->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
-$Theme->addAlternateCSS('PhpWiki', 'phpwiki.css');
+$WikiTheme->setDefaultCSS('Hawaiian', 'Hawaiian.css');
+$WikiTheme->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+$WikiTheme->addAlternateCSS(_("Modern"), 'phpwiki-modern.css');
+$WikiTheme->addAlternateCSS('PhpWiki', 'phpwiki.css');
 
 /**
  * The logo image appears on every page and links to the HomePage.
  */
-$Theme->addImageAlias('logo', 'PalmBeach.jpg');
-$Theme->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+$WikiTheme->addImageAlias('logo', 'PalmBeach.jpg');
+$WikiTheme->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
 /**
@@ -42,28 +42,28 @@ $Theme->addImageAlias('logo', WIKI_NAME 
  * be omitted.
  */
-//$Theme->addImageAlias('signature', 'SubmersiblePiscesV.jpg');
-$Theme->addImageAlias('signature', 'WaterFall.jpg');
-$Theme->addImageAlias('signature', WIKI_NAME . "Signature.png");
+//$WikiTheme->addImageAlias('signature', 'SubmersiblePiscesV.jpg');
+$WikiTheme->addImageAlias('signature', 'WaterFall.jpg');
+$WikiTheme->addImageAlias('signature', WIKI_NAME . "Signature.png");
 // Uncomment this next line to disable the signature.
-//$Theme->addImageAlias('signature', false);
+//$WikiTheme->addImageAlias('signature', false);
 
 // If you want to see more than just the waterfall let a random
 // picture be chosen for the signature image:
-//include_once($Theme->file('lib/random.php'));
-include_once("themes/$Theme->_name/lib/random.php");
-$imgSet = new randomImage($Theme->file("images/pictures"));
+//include_once($WikiTheme->file('lib/random.php'));
+include_once("themes/$WikiTheme->_name/lib/random.php");
+$imgSet = new randomImage($WikiTheme->file("images/pictures"));
 $imgFile = "pictures/" . $imgSet->filename;
-$Theme->addImageAlias('signature', $imgFile);
+$WikiTheme->addImageAlias('signature', $imgFile);
 
 //To test out the randomization just use logo instead of signature
-//$Theme->addImageAlias('logo', $imgFile);
+//$WikiTheme->addImageAlias('logo', $imgFile);
 
 /*
  * Link Icons
  */
-$Theme->setLinkIcon('interwiki');
-$Theme->setLinkIcon('*', 'flower.png');
+$WikiTheme->setLinkIcon('interwiki');
+$WikiTheme->setLinkIcon('*', 'flower.png');
 
-$Theme->setButtonSeparator(' ');
+$WikiTheme->setButtonSeparator(' ');
 
 /**
@@ -71,5 +71,5 @@ $Theme->setButtonSeparator(' ');
  * the words. The default is to leave WordsSmashedTogetherLikeSo.
  */
-$Theme->setAutosplitWikiWords(true);
+$WikiTheme->setAutosplitWikiWords(true);
 
 /*
@@ -81,5 +81,5 @@ $Theme->setAutosplitWikiWords(true);
  * user's time zone.
  */
-//$Theme->setDateFormat("%B %d, %Y");	    // must not contain time
+//$WikiTheme->setDateFormat("%B %d, %Y");	    // must not contain time