diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2008-12-26 17:12:44 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2008-12-26 17:12:44 +0100 |
| commit | 443d207b937495af46f088d883836ad9094bccdd (patch) | |
| tree | 6bc3a0a0cb411fcc269337f05d6fdbcefbe90736 | |
| parent | 6df2a685ec14723d4413b8df7a95de5f183a873f (diff) | |
| download | rpg-443d207b937495af46f088d883836ad9094bccdd.tar.gz rpg-443d207b937495af46f088d883836ad9094bccdd.tar.bz2 | |
fixed PHP4 incompatibility in sectionID() FS#1553
darcs-hash:20081226161244-7ad00-8c843ea6a06a0d36fc322d109497239ab6ea229c.gz
| -rw-r--r-- | inc/actions.php | 3 | ||||
| -rw-r--r-- | inc/pageutils.php | 4 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/inc/actions.php b/inc/actions.php index 0a347f472..bebdeefce 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -340,7 +340,8 @@ function act_redirect($id,$preact){ //get section name when coming from section edit if($PRE && preg_match('/^\s*==+([^=\n]+)/',$TEXT,$match)){ - $title = sectionID($match[0]); + $check = false; + $title = sectionID($match[0],$check); } $opts = array( diff --git a/inc/pageutils.php b/inc/pageutils.php index 7a140ef8c..ccf8d10b8 100644 --- a/inc/pageutils.php +++ b/inc/pageutils.php @@ -195,7 +195,7 @@ function noNSorNS($id) { * @param array $check List of existing IDs * @author Andreas Gohr <andi@splitbrain.org> */ -function sectionID($title,&$check=null) { +function sectionID($title,&$check) { $title = str_replace(':','',cleanID($title)); $new = ltrim($title,'0123456789._-'); if(empty($new)){ @@ -204,7 +204,7 @@ function sectionID($title,&$check=null) { $title = $new; } - if(!is_null($check) && is_array($check)){ + if(is_array($check)){ // make sure tiles are unique $num = ''; while(in_array($title.$num,$check)){ diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 4749c470d..7ea238f6f 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -1006,7 +1006,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if($create){ return sectionID($title,$this->headers); }else{ - return sectionID($title); + $check = false; + return sectionID($title,$check); } } |