[Phpgroupware-cvs] CVS: etemplate/inc class.html.inc.php, 1.22.2.2, 1.22.2.3

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv5929

Modified Files:
      Tag: Version-0_9_16-branch
        class.html.inc.php 
Log Message:
fixing the fix, useing php4 function parse_str() now


Index: class.html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.html.inc.php,v
retrieving revision 1.22.2.2
retrieving revision 1.22.2.3
diff -C2 -r1.22.2.2 -r1.22.2.3
*** class.html.inc.php  21 Aug 2003 21:14:59 -0000      1.22.2.2
--- class.html.inc.php  22 Aug 2003 11:13:24 -0000      1.22.2.3
***************
*** 169,182 ****
        function link($url,$vars='')
        {
                if (!is_array($vars))
                {
!                       $vars = empty($vars) ? array() : explode('&',$vars);
                }
                list($url,$v) = explode('?',$url);      // url may contain 
additional vars
                if ($v)
                {
!                       $vars += explode('&',$v);
                }
!               return $GLOBALS['phpgw']->link($url,implode('&',$vars));
        }
  
--- 169,184 ----
        function link($url,$vars='')
        {
+               //echo "<p>html::link(url='$url',vars='"; print_r($vars); echo 
"')</p>\n";
                if (!is_array($vars))
                {
!                       parse_str($vars,$vars);
                }
                list($url,$v) = explode('?',$url);      // url may contain 
additional vars
                if ($v)
                {
!                       parse_str($v,$v);
!                       $vars += $v;
                }
!               return $GLOBALS['phpgw']->link($url,$vars);
        }