1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00

Sitelinks array routine work

This commit is contained in:
Cameron
2012-12-13 02:02:42 -08:00
parent 24a1d695d4
commit 32e1a53a90

View File

@@ -1193,8 +1193,10 @@ class e_navigation
if (isset($row['link_parent']) && $row['link_parent'] != 0) if (isset($row['link_parent']) && $row['link_parent'] != 0)
{ {
$id = $row['link_parent']; $pid = $row['link_parent'];
$ret[$id]['link_sub'][] = $row; // $ret[$id]['link_sub'][] = $row;
$sub['sub-'.$pid][] = $row;
} }
else else
{ {
@@ -1211,7 +1213,8 @@ class e_navigation
$sublinkArray = e107::callMethod($class,$method); //TODO Cache it. $sublinkArray = e107::callMethod($class,$method); //TODO Cache it.
if(vartrue($sublinkArray)) if(vartrue($sublinkArray))
{ {
$ret[$id]['link_sub'] = $sublinkArray; $sub['sub-'.$id] = $sublinkArray;
//$ret[$id]['link_sub'] = $sublinkArray;
} }
} }
} }
@@ -1219,10 +1222,28 @@ class e_navigation
} }
} }
return $this->compile($ret, $sub);
return $ret; return $ret;
} }
function compile($ret, $sub)
{
$new = array();
foreach($ret as $k=>$v)
{
$new[$k] = $v;
$p = $v['link_id'];
if(isset($sub['sub-'.$p]))
{
$new[$k]['link_sub'] = $sub['sub-'.$p];
}
}
return $new;
}
/** /**