From: Reini U. <ru...@us...> - 2007-08-26 12:23:11
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11848 Modified Files: Template.php Log Message: fix doc: uppercase arguments Index: Template.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Template.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -2 -b -p -d -r1.10 -r1.11 --- Template.php 7 Jun 2007 17:03:38 -0000 1.10 +++ Template.php 25 Aug 2007 18:07:26 -0000 1.11 @@ -2,5 +2,5 @@ rcs_id('$Id$'); /* - Copyright 2005 $ThePhpWikiProgrammingTeam + Copyright 2005,2007 $ThePhpWikiProgrammingTeam This file is part of PhpWiki. @@ -35,14 +35,16 @@ rcs_id('$Id$'); * the placeholder is %%var%% and not {{{var}}} as in mediawiki. * - * The following predefined variables are automatically expanded if existing: - * pagename - * mtime - last modified date + time - * ctime - creation date + time - * author - last author - * owner - * creator - first author + * The following predefined uppercase variables are automatically expanded if existing: + * PAGENAME + * MTIME - last modified date + time + * CTIME - creation date + time + * AUTHOR - last author + * OWNER + * CREATOR - first author * SERVER_URL, DATA_PATH, SCRIPT_NAME, PHPWIKI_BASE_URL and BASE_URL * - * <noinclude> .. </noinclude> is stripped + * <noinclude> .. </noinclude> is stripped from the template expansion. + * <includeonly> .. </includeonly> is only expanded in pages using the template, + * not in the template itself. * * See also: @@ -84,4 +86,5 @@ extends WikiPlugin return $name != 'action'; } + // TODO: check if page can really be pulled from the args, or if it is just the basepage. function getWikiPageLinks($argstr, $basepage) { @@ -135,13 +138,15 @@ extends WikiPlugin $initial_content = implode("\n", $c); } - + // exclude from expansion if (preg_match('/<noinclude>.+<\/noinclude>/s', $initial_content)) { $initial_content = preg_replace("/<noinclude>.+?<\/noinclude>/s", "", $initial_content); } + // only in expansion + $initial_content = preg_replace("/<includeonly>(.+)<\/includeonly>/s", "\\1", + $initial_content); $this->doVariableExpansion($initial_content, $vars, $basepage, $request); array_push($included_pages, $page); - include_once('lib/BlockParser.php'); $content = TransformText($initial_content, $r->get('markup'), $page); @@ -205,4 +210,7 @@ extends WikiPlugin // $Log$ +// Revision 1.11 2007/08/25 18:07:26 rurban +// fix doc: uppercase arguments +// // Revision 1.10 2007/06/07 17:03:38 rurban // minor optimization: move explode("\n", $initial_content) to section code |