[phpwiki-checkins] CVS: phpwiki/lib Theme.php,1.53,1.54 display.php,1.37,1.38

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

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

Modified Files:
	Theme.php display.php 
Log Message:
AutoSplit Buttons and links in navbar also


Index: Theme.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Theme.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -2 -b -p -d -r1.53 -r1.54
--- Theme.php	2 Sep 2002 14:36:58 -0000	1.53
+++ Theme.php	15 Sep 2002 20:17:58 -0000	1.54
@@ -685,5 +685,6 @@ class Theme {
         $args = $version ? array('version' => $version) : false;
 
-        return $this->makeButton($label ? $label : $pagename, WikiURL($pagename, $args), 'wiki');
+        return $this->makeButton($label ? $label : $this->maybeSplitWikiWord($pagename), 
+                                 WikiURL($pagename, $args), 'wiki');
     }
 
@@ -812,5 +813,5 @@ class Button extends HtmlElement {
         if ($request->getArg('frame'))
             $this->setAttr('target', '_top');
-        $this->pushContent($text);
+        $this->pushContent($GLOBALS['Theme']->maybeSplitWikiWord($text));
     }
 

Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -2 -b -p -d -r1.37 -r1.38
--- display.php	2 Sep 2002 09:34:05 -0000	1.37
+++ display.php	15 Sep 2002 20:17:58 -0000	1.38
@@ -135,5 +135,6 @@ function displayPage(&$request, $tmpl = 
     header("Content-Type: text/html; charset=" . CHARSET);
     // don't clobber date header given by RC
-    if ( ! ($pagename == _("RecentChanges") || $pagename == _("RecentEdits") || defined('DEBUG')) )
+    if ( ! ($pagename == _("RecentChanges") || $pagename == _("RecentEdits") || 
+            (defined('DEBUG') and DEBUG)) )
         header("Last-Modified: ".Rfc2822DateTime($revision->get('mtime')));