Ignore:
Timestamp:
2006-10-17T20:30:41+02:00 (8 years ago)
Author:
moo
Message:
  • fix build on rare arch
  • fix build on Mac OS X
  • merged from trunk: 159,161-162,167-180,182,184,186-187,194
    • [194] PHP_5_2: new element in zend_brk_cont_element
    • [186] [187] fix build on some rare arch
    • [184] fix tplcov
    • [178] fix type processor_t conflict with Mac OS X
Location:
branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.1

  • branches/1.1/coverager/coverager.php

    r124 r255  
    6262        $this->path = isset($_GET['path']) ? $_GET['path'] : ''; 
    6363        $this->path = preg_replace('!\.{2,}!', '.', $this->path); 
    64         $this->path = preg_replace('![\\\\/]{2,}!', '/', $this->path); 
     64        $qsep = preg_quote(DIRECTORY_SEPARATOR, '!'); 
     65        $this->path = preg_replace("![\\\\$qsep]{2,}!", DIRECTORY_SEPARATOR, $this->path); 
     66        $this->path = preg_replace("!$qsep$!", '', $this->path); 
    6567        if ($this->path == '/') { 
    6668            $this->path = ''; 
     
    118120            list($tplfile, $tpllines, $tplcov) = $this->loadTplCov($fileinfo['cov'], substr($this->outpath, $this->datadir_len)); 
    119121            if ($tplfile) { 
    120                 $tplcov = sprint_cov($tplinfo['tplcov'], $tpllines); 
     122                $tplcov = sprint_cov($tplcov, $tpllines); 
    121123                unset($tpllines); 
    122124            } 
Note: See TracChangeset for help on using the changeset viewer.