From d86ddd0eaebe2729a4f6fb9ea0e95c86c20d611d Mon Sep 17 00:00:00 2001 From: real_nowhereman Date: Thu, 1 Jan 2009 19:11:34 +0000 Subject: [PATCH] php4 compatibility --- admin/panels/maintain/admin.maintain.php | 4 ++-- fp-includes/core/core.bplustree.class.php | 16 ++++++++-------- fp-includes/core/core.entry.php | 2 +- fp-includes/core/core.fpdb.class.php | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/admin/panels/maintain/admin.maintain.php b/admin/panels/maintain/admin.maintain.php index b86dbc4..b5e239c 100755 --- a/admin/panels/maintain/admin.maintain.php +++ b/admin/panels/maintain/admin.maintain.php @@ -40,9 +40,9 @@ var $_directory = CONTENT_DIR; - function __construct() { + function s_entry_crawler() { $this->index =& entry_init(); - parent::__construct(); + parent::fs_filelister(); } function _checkFile($directory, $file) { diff --git a/fp-includes/core/core.bplustree.class.php b/fp-includes/core/core.bplustree.class.php index 3b4e154..da59009 100755 --- a/fp-includes/core/core.bplustree.class.php +++ b/fp-includes/core/core.bplustree.class.php @@ -206,7 +206,7 @@ class pairs { * @parma array $b array of the second elements of each pair * */ - function pairs(array $a, array $b) { + function pairs($a, $b) { if (($v=count($a))!=count($b)) trigger_error("Size of params must match", E_USER_ERROR); $this->a=$a; $this->b=$b; @@ -1538,14 +1538,14 @@ class BPlusTree { * @param string $keyupper key upper bound of the iterator * @param bool $includeupper if true $keyupper is included in the iterator */ - function walker( - &$keylower =null, + function &walker( + &$keylower, $includelower =null, $keyupper =null, $includeupper =null ) { - return new BPlusWalker($this, $keylower, $includelower, $keyupper, $includeupper); + return $o =& new BPlusWalker($this, $keylower, $includelower, $keyupper, $includeupper); } @@ -2345,7 +2345,7 @@ class BPlusWalker { function BPlusWalker( &$tree, - &$keylower=null, + &$keylower, $includelower=null, $keyupper=null, $includeupper=null){ @@ -2563,14 +2563,14 @@ class SBPlusTree extends BPlusTree { return $seek; } - function walker( - &$keylower =null, + function &walker( + &$keylower, $includelower =null, $keyupper =null, $includeupper =null ) { - return new SBPlusWalker($this, $keylower, $includelower, $keyupper, $includeupper); + return $o =& new SBPlusWalker($this, $keylower, $includelower, $keyupper, $includeupper); } } diff --git a/fp-includes/core/core.entry.php b/fp-includes/core/core.entry.php index 4a4b34e..a259510 100755 --- a/fp-includes/core/core.entry.php +++ b/fp-includes/core/core.entry.php @@ -101,7 +101,7 @@ } function add($id, $entry, $del = array()) { - $key =& entry_idtokey($id); + $key = entry_idtokey($id); $val = $entry['SUBJECT']; $main =& $this->get_index(); diff --git a/fp-includes/core/core.fpdb.class.php b/fp-includes/core/core.fpdb.class.php index 9525b5a..ff52ed2 100644 --- a/fp-includes/core/core.fpdb.class.php +++ b/fp-includes/core/core.fpdb.class.php @@ -253,7 +253,7 @@ #$this->local_list = array_keys($entry_index); $index_count = $entry_index->length(); - $this->walker =& $entry_index->walker(); + $this->walker =& $entry_index->walker($firstid=null); } else { // notice this won't work with cats (for now)