From 443d207b937495af46f088d883836ad9094bccdd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 26 Dec 2008 17:12:44 +0100
Subject: [PATCH] fixed PHP4 incompatibility in sectionID() FS#1553
darcs-hash:20081226161244-7ad00-8c843ea6a06a0d36fc322d109497239ab6ea229c.gz
---
inc/actions.php | 3 ++-
inc/pageutils.php | 4 ++--
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);
}
}
--
GitLab