remove Call-time pass-by-reference

diff --git a/ipf/admin/views.php b/ipf/admin/views.php
index 852ebe0b3a7beb1874a4c9f67c07948dd51706cb..f2116478806e53348778580970f1c6a8a97ebe79 100644 (file)
--- a/ipf/admin/views.php
+++ b/ipf/admin/views.php
@@ -127,7 +127,7 @@ function IPF_Admin_Views_EditItem($request, $match)
             $o = new $m();
             $item = $o->getTable()->find($id);
             
-            return $ma->EditItem($request, $lapp, $lmodel, &$item);
+            return $ma->EditItem($request, $lapp, $lmodel, $item);
         }
     }
     
@@ -157,8 +157,8 @@ function IPF_Admin_Views_DeleteItem($request, $match)
             $o = new $m();
             $item = $o->getTable()->find($id);
             
-            return $ma->DeleteItem($request, $lapp, $lmodel, &$item);
-        }    
+            return $ma->DeleteItem($request, $lapp, $lmodel, $item);
+        }
     }
     
     return new IPF_HTTP_Response_NotFound();
@@ -409,8 +409,8 @@ function IPF_Admin_Views_FileBrowser($request, $match){
         }
         closedir($dh);
     }
-    usort(&$dirs, 'cmp');
-    usort(&$files, 'cmp');
+    usort($dirs, 'cmp');
+    usort($files, 'cmp');
     
     $dirtree = dir_recursive($upload_path);
 

diff --git a/ipf/form/field/file.php b/ipf/form/field/file.php
index 8245614e876484b22ad1614b463c8b920f2fc505..306a88fff509edfe11f26c0469d1c197e4bc35bc 100644 (file)
--- a/ipf/form/field/file.php
+++ b/ipf/form/field/file.php
@@ -11,13 +11,13 @@ class IPF_Form_Field_File extends IPF_Form_Field
 
     function clean($value)
     {
-       if (@$value['remove']===true){
+        if (@$value['remove']===true){
             IPF::loadFunction($this->remove_function);
             return call_user_func($this->remove_function, $value['data']);
         }
         if (@$value['name']!=@$value['rename']){
             IPF::loadFunction($this->rename_function);
-               return call_user_func($this->rename_function, &$value);
+            return call_user_func($this->rename_function, $value);
         }
         $value = @$value['data'];
         
@@ -80,9 +80,10 @@ function IPF_Form_Field_removeFile($value, $params=array()){
 }
 
 function IPF_Form_Field_renameFile($value, $params=array()){
-       $upload_path = IPF::getUploadPath($params);
+    $upload_path = IPF::getUploadPath($params);
     $old_name = @$upload_path.DIRECTORY_SEPARATOR.$value['name'];
     $new_name = @$upload_path.DIRECTORY_SEPARATOR.$value['rename'];
     @rename($old_name, $new_name);
     return @$value['rename'];
 }
+