Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv25408
Modified Files:
stdlib.php
Log Message:
Cleanup: updated function list, reindending, rewrapping in emacs.
Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** stdlib.php 2002/01/08 02:11:32 1.69
--- stdlib.php 2002/01/08 03:17:41 1.70
***************
*** 1,32 ****
<?php rcs_id('$Id$');
! /*
! Standard functions for Wiki functionality
! WikiURL($pagename, $args, $abs)
! CSS_URL($CSS_URLS, $CSS_DEFAULT)
! LinkWikiWord($wikiword, $linktext)
! LinkExistingWikiWord($wikiword, $linktext)
! LinkUnknownWikiWord($wikiword, $linktext)
! LinkURL($url, $linktext)
[...1118 lines suppressed...]
! // literal variable name substitution only to keep locale
! // strings uncluttered
! trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
! '%1\$s','%s'), E_USER_WARNING);
!
$fmt = preg_replace('/(?<!%)%\d+\$/x', '%', $fmt);
$newargs = array();
!
// Reorder arguments appropriately.
foreach($m[1] as $argnum) {
if ($argnum < 1 || $argnum > count($args))
! trigger_error(sprintf(_("%s: argument index out of range"),
! $argnum), E_USER_WARNING);
$newargs[] = $args[$argnum - 1];
}
$args = $newargs;
}
!
// Not all PHP's have vsprintf, so...
array_unshift($args, $fmt);
|
