[Phpgroupware-cvs] CVS: chora cvs.php,1.11.2.1,1.11.2.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/chora
In directory subversions:/tmp/cvs-serv16932

Modified Files:
      Tag: Version-0_9_14-branch
        cvs.php 
Log Message:
fixed param where in the url to not start with a '/' to get cvs annotate working


Index: cvs.php
===================================================================
RCS file: /cvsroot/phpgroupware/chora/cvs.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** cvs.php     20 Jan 2002 22:10:22 -0000      1.11.2.1
--- cvs.php     2 Mar 2003 18:33:43 -0000       1.11.2.2
***************
*** 41,45 ****
                checkError($dirList = $dir->queryDirList());
                checkError($fileList = $dir->queryFileList($atticFlags));
! 
                /* Decide what title to display */
                if ($where == '')
--- 41,45 ----
                checkError($dirList = $dir->queryDirList());
                checkError($fileList = $dir->queryFileList($atticFlags));
!               
                /* Decide what title to display */
                if ($where == '')
***************
*** 87,91 ****
                if ($where != '')
                {
!                       $url = 
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . 
preg_replace('|[^/]+$|', '', $where));
                        include($conf['paths']['templates'].'/dir_back.inc');
                }
--- 87,91 ----
                if ($where != '')
                {
!                       $url = 
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . 
preg_replace('|/?[^/]+$|', '', $where));
                        include($conf['paths']['templates'].'/dir_back.inc');
                }
***************
*** 96,100 ****
                {
                        $dirrow = (++$dirrow % 2);
!                       $url = 
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . $where . '/' . 
$currDir);
                        
include($conf['paths']['templates'].'/dir_directory.inc');
                }
--- 96,100 ----
                {
                        $dirrow = (++$dirrow % 2);
!                       $url = 
$GLOBALS['phpgw']->link('/chora/cvs.php','rt='.$rt.'&where=' . ($where ? $where 
. '/' : '') . $currDir);
                        
include($conf['paths']['templates'].'/dir_directory.inc');
                }