mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix orphaned categories, textile plugin, smarty commentform function

Browse Source
This commit is contained in:
Garvin Hicking
2006-08-27 11:29:00 +00:00
parent 76af9ed5d6
commit 9814e3c40a
5 changed files with 109 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/functions.inc.php
View File

@ -293,8 +293,9 @@ function serendipity_fetchTemplateInfo($theme, $abspath = null) {
function serendipity_walkRecursive($ary, $child_name = 'id', $parent_name = 'parent_id', $parentid = 0, $depth = 0) {
global $serendipity;
static $_resArray;
static $_remain;
if ( sizeof($ary) == 0 ) {
if (sizeof($ary) == 0) {
return array();
}
@ -302,14 +303,16 @@ function serendipity_walkRecursive($ary, $child_name = 'id', $parent_name = 'par
$parentid = 0;
}
if ( $depth == 0 ) {
if ($depth == 0) {
$_resArray = array();
$_remain = $ary;
}
foreach ($ary as $data) {
foreach($ary AS $key => $data) {
if ($parentid === VIEWMODE_LINEAR || !isset($data[$parent_name]) || $data[$parent_name] == $parentid) {
$data['depth'] = $depth;
$_resArray[] = $data;
$_resArray[] = $data;
unset($_remain[$key]);
if ($data[$child_name] && $parentid !== VIEWMODE_LINEAR ) {
serendipity_walkRecursive($ary, $child_name, $parent_name, $data[$child_name], ($depth+1));
}
@ -320,6 +323,14 @@ function serendipity_walkRecursive($ary, $child_name = 'id', $parent_name = 'par
if ($depth !== 0) {
return true;
}
if (count($_remain) > 0) {
// Remaining items need to be appended
foreach($_remain AS $key => $data) {
$data['depth'] = 0;
$_resArray[] = $data;
}
}
return $_resArray;
}