Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15457/lib
Modified Files:
stdlib.php
Log Message:
Split BumpyWords in page title.
Also minor code cleanup: ###BROWSE_PAGE### and ###ACTION### make no sense
for the MESSAGE template.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** stdlib.php 2001/03/02 00:16:53 1.36
--- stdlib.php 2001/03/05 23:37:32 1.37
***************
*** 528,531 ****
--- 528,535 ----
_dotoken('USERID', htmlspecialchars($user->id()), $page);
_dotoken('PAGE', htmlspecialchars($name), $page);
+ _dotoken('SPLIT_PAGE',
+ htmlspecialchars(
+ preg_replace('/([[:lower:]])([[:upper:]])/', '\\1 \\2', $name)),
+ $page);
_dotoken('LOGO', htmlspecialchars(DataURL($logo)), $page);
_dotoken('CSS_URL', htmlspecialchars(DataURL(CSS_URL)), $page);
***************
*** 538,545 ****
// FIXME: Clean up this stuff
- $browse_page = WikiURL($name);
- _dotoken('BROWSE_PAGE', $browse_page, $page);
- $arg_sep = strstr($browse_page, '?') ? '&' : '?';
- _dotoken('ACTION', $browse_page . $arg_sep . "action=", $page);
_dotoken('BROWSE', WikiURL(''), $page);
--- 542,545 ----
***************
*** 561,564 ****
--- 561,570 ----
// invalid for messages (search results, error messages)
if ($template != 'MESSAGE') {
+ $browse_page = WikiURL($name);
+ _dotoken('BROWSE_PAGE', $browse_page, $page);
+
+ $arg_sep = strstr($browse_page, '?') ? '&' : '?';
+ _dotoken('ACTION', $browse_page . $arg_sep . "action=", $page);
+
_dotoken('PAGEURL', rawurlencode($name), $page);
if (!empty($hash['lastmodified']))
|
