diff options
author | Andreas Gohr <andi@splitbrain.org> | 2015-07-01 13:27:34 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2015-07-01 13:27:34 +0200 |
commit | 3f8531c4cdc3b4caf157a1b1e954e160be82064b (patch) | |
tree | 69e4ab5add04cfe1c63f515c80a37651bd5b54e8 /inc/pageutils.php | |
parent | 148205530159f4b6ce26df1c56dd8c461ec1f769 (diff) | |
parent | 19cd38771326eea15b458a160845dfa200c5f9e6 (diff) | |
download | rpg-3f8531c4cdc3b4caf157a1b1e954e160be82064b.tar.gz rpg-3f8531c4cdc3b4caf157a1b1e954e160be82064b.tar.bz2 |
Merge pull request #1215 from splitbrain/wikisyntaxpage
Wiki syntax page and minor
Diffstat (limited to 'inc/pageutils.php')
-rw-r--r-- | inc/pageutils.php | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/inc/pageutils.php b/inc/pageutils.php index 375712661..a5bf039d5 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -243,7 +243,6 @@ function sectionID($title,&$check) { return $title; } - /** * Wiki page existence check * @@ -251,9 +250,10 @@ function sectionID($title,&$check) { * * @author Chris Smith <chris@jalakai.co.uk> * - * @param string $id page id - * @param string|int $rev empty or revision timestamp - * @param bool $clean flag indicating that $id should be cleaned (see wikiFN as well) + * @param string $id page id + * @param string|int $rev empty or revision timestamp + * @param bool $clean flag indicating that $id should be cleaned (see wikiFN as well) + * @param bool $date_at * @return bool exists? */ function page_exists($id,$rev='',$clean=true, $date_at=false) { @@ -489,9 +489,11 @@ function resolve_id($ns,$id,$clean=true){ * * @author Andreas Gohr <andi@splitbrain.org> * - * @param string $ns namespace which is context of id - * @param string &$page (reference) relative media id, updated to resolved id - * @param bool &$exists (reference) updated with existance of media + * @param string $ns namespace which is context of id + * @param string &$page (reference) relative media id, updated to resolved id + * @param bool &$exists (reference) updated with existance of media + * @param int|string $rev + * @param bool $date_at */ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){ $page = resolve_id($ns,$page); @@ -502,7 +504,7 @@ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){ $rev = $medialog_rev; } } - + $file = mediaFN($page,$rev); $exists = file_exists($file); } @@ -512,9 +514,11 @@ function resolve_mediaid($ns,&$page,&$exists,$rev='',$date_at=false){ * * @author Andreas Gohr <andi@splitbrain.org> * - * @param string $ns namespace which is context of id - * @param string &$page (reference) relative page id, updated to resolved id - * @param bool &$exists (reference) updated with existance of media + * @param string $ns namespace which is context of id + * @param string &$page (reference) relative page id, updated to resolved id + * @param bool &$exists (reference) updated with existance of media + * @param string $rev + * @param bool $date_at */ function resolve_pageid($ns,&$page,&$exists,$rev='',$date_at=false ){ global $conf; |