From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
interface/lib/classes/tree.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/tree.inc.php b/interface/lib/classes/tree.inc.php
index a2bdfd2..dcc2d61 100644
--- a/interface/lib/classes/tree.inc.php
+++ b/interface/lib/classes/tree.inc.php
@@ -147,14 +147,14 @@
function deltree($tree_id) {
// lösche Einträge recursiv
- $this->_deltree_recurse(&$this->obj[$this->root_id],$tree_id, 0);
+ $this->_deltree_recurse($this->obj[$this->root_id],$tree_id, 0);
}
/*
Hilfsfunktion für deltree
*/
- function _deltree_recurse($myobj,$tree_id,$delete) {
+ function _deltree_recurse(&$myobj,$tree_id,$delete) {
if(is_array($myobj->childs)) {
foreach($myobj->childs as $val) {
@@ -164,7 +164,7 @@
}
// recurse durch Objekte
- $this->_deltree_recurse(&$val,$tree_id,$delete);
+ $this->_deltree_recurse($val,$tree_id,$delete);
// lösche Eintrag
if($delete == 1) {
--
Gitblit v1.9.1