fix deprecated calls

diff --git a/ipf/admin/model.php b/ipf/admin/model.php
index 7af23618d2620a3e120c667597e4e4a9b96e8310..cc1569fe88291b47c3d4cf9a24814040adde72e7 100644 (file)
--- a/ipf/admin/model.php
+++ b/ipf/admin/model.php
@@ -73,7 +73,7 @@ class ListTreeFilter extends BaseListFilter{
                 );
             }
         }
-        $this->_collectTreeRecursive(&$choices);
+        $this->_collectTreeRecursive($choices);
         parent::__construct($title, $choices);
     }
 
@@ -92,9 +92,9 @@ class ListTreeFilter extends BaseListFilter{
                 if ($parent_id!=$o->$foreign)
                     continue;
             }
-            $this->_addObject($o, &$choices, $level, $valname);
+            $this->_addObject($o, $choices, $level, $valname);
             if ($level<(count($this->fields)-1)){
-                $this->_collectTreeRecursive(&$choices,$level+1,$o->id,$valname.$o->id.'.');
+                $this->_collectTreeRecursive($choices,$level+1,$o->id,$valname.$o->id.'.');
             }
         }
     }
@@ -355,9 +355,9 @@ class IPF_Admin_Model{
         {
             $this->_beforeAdd(new $this->model());
             $data = $request->POST+$request->FILES;
-            $form = $this->_getAddForm($this->model, &$data, array('user_fields'=>$this->fields()));
+            $form = $this->_getAddForm($this->model, $data, array('user_fields'=>$this->fields()));
             $this->_setupAddForm($form);
-            $this->setInlines($this->model, &$data);
+            $this->setInlines($this->model, $data);
             if ($form->isValid()) {
                 $item = $form->save();
                 $this->saveInlines($item);
@@ -435,9 +435,9 @@ class IPF_Admin_Model{
         
             $this->_beforeEdit($o);
             $data = $request->POST+$request->FILES;
-            $form = $this->_getEditForm($o,&$data,array('user_fields'=>$this->fields()));
+            $form = $this->_getEditForm($o, $data, array('user_fields'=>$this->fields()));
             $this->_setupEditForm($form);
-            $this->setInlines($o, &$data);
+            $this->setInlines($o, $data);
             if ( ($form->isValid()) && ($this->isValidInlines()) ) {
                 $item = $form->save();
                 $this->saveInlines($item);
@@ -461,7 +461,7 @@ class IPF_Admin_Model{
                     }
                 }
             }
-            $form = $this->_getEditForm($o,&$data,array('user_fields'=>$this->fields()));
+            $form = $this->_getEditForm($o, $data, array('user_fields'=>$this->fields()));
             $this->_setupEditForm($form);
             $this->setInlines($o);
         }

diff --git a/ipf/form/field/treemodelchoice.php b/ipf/form/field/treemodelchoice.php
index 69d874ecb9e3bf163641927f388ace76a07e7d8a..bd20a08db5b39fdaa24747cd6016d0f35e68e75d 100644 (file)
--- a/ipf/form/field/treemodelchoice.php
+++ b/ipf/form/field/treemodelchoice.php
@@ -10,7 +10,7 @@ class IPF_Form_Field_TreeModelChoice extends IPF_Form_Field_Choice{
         $this->_models = $params['models'];
         $choices = array('--------'=>'');
         $levels = $this->_getLevels();
-        $this->_collectTreeRecursive(&$choices);
+        $this->_collectTreeRecursive($choices);
         $this->setChoices($choices);
         $this->widget->setLevels($levels);
     }    
@@ -39,9 +39,9 @@ class IPF_Form_Field_TreeModelChoice extends IPF_Form_Field_Choice{
                 if ($parent_id!=$o->$foreign)
                     continue;
             }
-            $this->_addObject($o, &$choices, $level, $valname);
+            $this->_addObject($o, $choices, $level, $valname);
             if ($level<(count($this->_models)-1)){
-                $this->_collectTreeRecursive(&$choices,$level+1,$o->id,$valname.$o->id.'.');
+                $this->_collectTreeRecursive($choices,$level+1,$o->id,$valname.$o->id.'.');
             }
         }
     }