Implementation of FS#872

darcs-hash:20081012140306-2b4f5-3fd4006f178e358be3d19be5c4244e56facd1b9a.gz

1 files changed, 6 insertions, 21 deletions

diff --git a/inc/search.php b/inc/search.php
index af4315cde..35e5a358a 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -43,38 +43,23 @@ function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
 
   //give directories to userfunction then recurse
   foreach($dirs as $dir){
-    if (search_callback($func,$data,$base,$dir,'d',$lvl,$opts)){
+    if (call_user_func_array($func, array(&$data,$base,$dir,'d',$lvl,$opts))){
       search($data,$base,$func,$opts,$dir,$lvl+1);
     }
   }
   //now handle the files
   foreach($files as $file){
-    search_callback($func,$data,$base,$file,'f',$lvl,$opts);
+    call_user_func_array($func, array(&$data,$base,$file,'f',$lvl,$opts));
   }
 }
 
 /**
- * Used to run a user callback
- *
- * Makes sure the $data array is passed by reference (unlike when using
- * call_user_func())
- *
- * @todo If this can be generalized it may be useful elsewhere in the code
- * @author Andreas Gohr <andi@splitbrain.org>
+ * Wrapper around call_user_func_array.
+ * 
+ * @deprecated
  */
 function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
-  if(is_array($func)){
-    if(is_object($func[0])){
-      // instanciated object
-      return $func[0]->$func[1]($data,$base,$file,$type,$lvl,$opts);
-    }else{
-      // static call
-      $f = $func[0].'::'.$func[1];
-      return $f($data,$base,$file,$type,$lvl,$opts);
-    }
-  }
-  // simple function call
-  return $func($data,$base,$file,$type,$lvl,$opts);
+  return call_user_func_array($func, array(&$data,$base,$file,$type,$lvl,$opts));
 }
 
 /**