[phpwiki-checkins] CVS: phpwiki/lib/plugin Toolbar.php,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv1153

Modified Files:
	Toolbar.php 
Log Message:
bugfix to prevent MacOSX themed RecentChanges buttons from appearing on wikis not using that theme

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Toolbar.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Toolbar.php	2002/01/07 08:07:44	1.2
--- Toolbar.php	2002/01/07 09:04:41	1.3
***************
*** 39,43 ****
                       'go'	=> false,
                       'style'	=> 'text',
!                      'name'	=> false
                       // TODO: new 'image' style for use with themes
                       // which have graphic buttons
--- 39,43 ----
                       'go'	=> false,
                       'style'	=> 'text',
!                      'name'	=> ''
                       // TODO: new 'image' style for use with themes
                       // which have graphic buttons
***************
*** 68,76 ****
              return $html;
          }
!         //begin oops: this is isn't supposed to work, but it does!
!         if ($name = "RecentChanges") {
!         //end oops
! //            global $ToolbarImages, $theme;
!             global $theme;
                  $ToolbarImages = array(
                  'RecentChanges' => array(
--- 68,76 ----
              return $html;
          }
!         global $theme;
! //$name="RecentChanges";
!         if ($theme == "MacOSX" && $name=="RecentChanges") {
!             global $ToolbarImages;
! /*
                  $ToolbarImages = array(
                  'RecentChanges' => array(
***************
*** 82,86 ****
                  '...'		=> "themes/$theme/locale/en/toolbars/RecentChanges/alltime.png")
                  );
!                 
                  $ToolbarURLs = array(
                  //'RecentChanges' => array(
--- 82,86 ----
                  '...'		=> "themes/$theme/locale/en/toolbars/RecentChanges/alltime.png")
                  );
! */                
                  $ToolbarURLs = array(
                  //'RecentChanges' => array(