Changeset 1298

Show
Ignore:
Timestamp:
09/25/07 07:52:11 (1 year ago)
Author:
benoitg
Message:
  • Menu.php: Fix a number of improper call time pass by reference
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wifidog-auth/CHANGELOG

    r1297 r1298  
    11# $Id$ 
     22007-09-25 Benoit Grégoire  <bock@step.polymtl.ca> 
     3        * Menu.php:  Fix a number of improper call time pass by reference 
     4 
    252007-09-24 Benoit Grégoire  <bock@step.polymtl.ca> 
    36        * locale/gensmarty.pl:  Heads up translators:  There was a bug in the regex; about 20 strings in the smarty templates were missed. 

  • trunk/wifidog-auth/wifidog/classes/Menu.php

    r1290 r1298  
    124124            //Only call if we are in a real menu item (and, among other, not at the root) 
    125125            //echo "menuArrayWalkRecursive(): Calling callback.<br/>"; 
    126             $retval = call_user_func($funcname, $menuArray, $menuItemIdx, &$userdata); 
     126            $retval = call_user_func_array($funcname, array($menuArray, $menuItemIdx, &$userdata)); 
    127127        } 
    128128        foreach ($menuArray['childrens'] as $menuItemIdx => $menuItem) { 
    129129            //pretty_print_r($menuItem); 
    130130            //echo "Recusively calling for $menuItemIdx<br/>"; 
    131             $retval = $retval & self::menuArrayWalkRecursiveReal($menuItem, $menuItemIdx, $funcname, &$userdata); 
     131            $retval = $retval & self::menuArrayWalkRecursiveReal($menuItem, $menuItemIdx, $funcname, $userdata); 
    132132        } 
    133133        return $retval; 
    …… 
    136136    /** Takes an array_walk_recursive compatible callback.  Will be called for each menu item */ 
    137137    public function menuArrayWalkRecursive($funcname, &$userdata = null) { 
    138         return self::menuArrayWalkRecursiveReal($this->_menuArray, 0, $funcname, &$userdata); 
     138        return self::menuArrayWalkRecursiveReal($this->_menuArray, 0, $funcname, $userdata); 
    139139    } 
    140140    /** Compare menu items according to it's title output passed to strcoll().  The toString 
    …… 
    158158            //pretty_print_r($menuItem); 
    159159            //echo "Recusively calling for $menuItemIdx<br/>"; 
    160             $retval = $retval & self::menuArraySort($menuItem, $funcname, &$userdata); 
     160            $retval = $retval & self::menuArraySort($menuItem, $funcname, $userdata); 
    161161        } 
    162162        return $retval;